Merge pull request #48 from JohnCny/master

merge
Merge pull request #49 from JohnCny/master

merge
Merge pull request #50 from JohnCny/master

merge
Merge pull request #51 from JohnCny/master

merge
Merge pull request #77 from tanwh/master

重新提交被覆盖的代码