Merge pull request #2 from LinZap/master

ok mer
Merge pull request #15 from st937072012/master

Merge pull request #2 from LinZap/master