Merge pull request #2 from pyrated/master

More UTF-8 stuff