Merge pull request #200 from annando/master