Even more unicode fixes
Don't decode unicode
Merge pull request #149 from maebert/unicode-fixes

Even more unicode fixes