Merge pull request #19 from JohnCny/master

merge
Merge pull request #20 from JohnCny/master

merge
[add]未提交
Merge pull request #61 from qkhj/master

add