Merge pull request #9 from LinZap/master

add more
Merge pull request #30 from st937072012/master

Merge pull request #9 from LinZap/master