Fixes #9
Merge pull request #19 from mtoma/fix-issue-9

Fixes #9