Fixes issue #45
Merge pull request #46 from smoller/master

Fixes issue #45