Try to support more encodings
Merge branch 'master' into convert_for_gem_use