Fixes #8
Merge pull request #15 from mtoma/fix-issue-8

Fixes #8