Merge pull request #185 from annando/master