Fix characters with wrong encoding
Merge pull request #2085 from dlobo/EncodingFixes

Fix characters with wrong encoding