Merge pull request #74 from JohnCny/master

merge
Merge pull request #75 from JohnCny/master

merge
兴化修改
Merge pull request #117 from tanwh/master

兴化修改