Fixes #190
Merge pull request #218 from mtoma/fix-issue-190

Fixes #190