remove duplicate unicode method
Merge branch 'master' into integration
fix odd intentation
Merge branch 'master' into integration