修正为utf-8编码
Merge 'lihuan' to 'master'