Fixes #7
Fixes #7
Merge pull request #20 from mtoma/fix-issue-7

Fix issue 7