Fix some encoding issues
Merge pull request #16 from kennknowles/encoding-issues

Fix some encoding issues