Merge pull request #239 from annando/master