Merge pull request #70 from embray/issue-68

Alternate fix for #68
Preparing to release v0.4.1