character set implemented
character set implemented
Merge origin/master