Fixes #73
Merge pull request #74 from bmcfee/master

Fixes #73