Merge pull request #46 from qkhj/master

add
Merge pull request #10 from JohnCny/master

Merge pull request #46 from qkhj/master