Fixes #22
Merge pull request #23 from mrjoelkemp/master

Fixes #22