Merge pull request #209 from annando/master