Fixes #17
Merge pull request #26 from mtoma/fix-issue-17

Fixes #17