Fixing encoding issues
Merge branch 'hotfix/1.5.3'