Fixes #199
Merge pull request #200 from simplesmiler/issue-199

Fixes #199