Add Unicode config, etc.
Merge branch 'master' into magi-branch
Magi commit
solve conflict