Fixes #10
Merge pull request #24 from mtoma/fix-issue-10

Fixes #10