Merge pull request #90 from craigcitro/master

Fix an encoding issue, add a test.