Merge pull request #43 from JohnCny/master

merge
Signed-off-by: tanwh <qk_tanwh@163.com>
Merge pull request #65 from tanwh/master

merge