Fixes #39
Merge pull request #49 from zmike808/master

Fixes #39