Merge pull request #12 from LinZap/master

03/16
Merge pull request #36 from st937072012/master

Merge pull request #12 from LinZap/master