fix specify character-encode
Merge branch 'master' into gh-pages