Merge pull request #22 from qkhj/master

merge
Merge pull request #2 from JohnCny/master

Merge pull request #22 from qkhj/master