再改改编码
Merge pull request #4 from suchfun/master

再改改编码