Fixes #46
Merge pull request #47 from abeisgreat/master

Fixes #46