Merge pull request #11 from LinZap/master

2014/03/10
Merge pull request #33 from st937072012/master

Merge pull request #11 from LinZap/master