Fix unicode bug
Merge branch 'master' into iate