Merge pull request #33 from JohnCny/master

merge
[modify]bug修复
Merge pull request #112 from qkhj/master

modify