Fixes #39
Merge pull request #50 from ejb1123/master

Fixes #39