Merge pull request #318 from daenney/unicode-fix