Added improved charset-support

Included charset-support as in GameDev's fork