Updates and fix.

I do not this this was intended.
UTF-8
Merge pull request #3 from Vexatos/master

Updates and fix