some charset magic
Merge pull request #1 from Nyoroon/master

some charset magic