Improved unicode conversion
Merge pull request #174 from digital-dreamer/improved-unicode-conversion

Improved unicode conversion