Add non UTF-8 encoding support
4 files changed