Fixes #11
Merge pull request #18 from mtoma/fix-issue-11

Fixes #11