Improved utf-8-mac conversion
Merge pull request #338 from todashuta/utf-8-mac

Improved utf-8-mac conversion.