Merge pull request #2 from somtomking/master-cn

针对国内定制
Merge pull request #3 from somtomking/master-cn

Master cn
Merge branch 'master-cn'
文件忽略