Merge pull request #77 from tanwh/master

重新提交被覆盖的代码
Merge pull request #78 from tanwh/master

重新提交被覆盖的代码
Merge pull request #52 from JohnCny/master

merge