Fixes #235
Merge pull request #2 from mtoma/fix-issue-235

Fixes #235