Merge pull request #11 from JohnCny/master

merge
Merge pull request #12 from JohnCny/master

merge
Merge pull request #13 from JohnCny/master

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

[mod]兴化修改