Merge pull request #71 from JohnCny/master

merge
Merge pull request #110 from qkhj/master

modify
Merge pull request #72 from JohnCny/master

merge
[mod]兴化修改
Merge pull request #111 from tanwh/master

[mod]兴化修改
Merge pull request #33 from JohnCny/master

merge