Merge pull request #2 from LinZap/master

更新
Merge pull request #25 from auto60713/master

Merge pull request #2 from LinZap/master