Workaround for #74. What a hack.
Merge pull request #81 from jfly/master

Fixes #75, #77, and #80
Merge pull request #82 from jfly/issue74

Fix for #74