Merge pull request #1 from zanpen2000/master

Merge pull request #1 from maxzhang1985/master
注释
Merge pull request #2 from maxzhang1985/master

need update version2