Merge pull request #2 from LinZap/master

m
Merge pull request #3 from yamaZap/master

Merge pull request #2 from LinZap/master