Fixes #22
Merge pull request #25 from mtoma/fix-issue-22

Fixes #22