Fixes #173
Merge pull request #6 from mtoma/fix-issue-173

Fixes #173