Removed non-standard encoding.
Merge pull request #376 from kubark42/non-standard-encoding

Removed non-standard encoding.