Add charset support
Merge branch 'add-charset-support'