Fixes #225
Merge pull request #12 from mtoma/fix-issue-225

Fixes #225