jmgff2014帮gongming修改了
Merge pull request #1 from jmgff/master

jmgff2014帮gongming修改了