Merge pull request #186 from annando/master