Fixes #27
Merge pull request #30 from haroldkyle/master

Fixes #27