fix issue #64
fix issue #64 (all tests pass)
Merge pull request #65 from zachahn/master

fix issue #64