Merge pull request #6 from LinZap/master

add fix
Merge pull request #24 from st937072012/master

Merge pull request #6 from LinZap/master