Merge pull request #44 from qkhj/master

merge
Merge pull request #15 from JohnCny/master

merge