Fixes #207
Merge pull request #208 from firstrow/patch-2

Fixes #207