Merge pull request #68 from JohnCny/master

merge
Merge pull request #69 from JohnCny/master

merge
Merge pull request #70 from JohnCny/master

merge
[mod]一些bug修复
Merge pull request #109 from tanwh/master

[mod]一些bug修复