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

Fixes #225