Merge pull request #1 from LinZap/master

a
Merge pull request #2 from yamaZap/master

Merge pull request #1 from LinZap/master