Merge pull request #1 from LinZap/master

fef
Merge pull request #5 from auto60713/master

Merge pull request #1 from LinZap/master