Revert "Fix for #36"
Merge pull request #38 from escalant3/revert-37-patch-1

Revert "Fix for #36"