Fixed a bug with writing out non-ASCII characters
Merge branch 'master' into CMD