Fixes #19
Merge pull request #20 from fehwalker/issue-19

Fixes #19