add
Merge pull request #51 from st937072012/master

Merge pull request #16 from LinZap/master
Merge pull request #17 from LinZap/master

0512 merging