Merge pull request #2 from runing2000/master

branch1
Merge pull request #3 from runing2000/branch1

Merge pull request #2 from runing2000/master