Merge pull request #222 from TheMightyBuzzard/master

Working-ish unicode