Merge pull request #7 from LinZap/master

add3
Merge pull request #26 from st937072012/master

Merge pull request #7 from LinZap/master