Merge pull request #52 from JohnCny/master

merge
Merge pull request #53 from JohnCny/master

merge
[add]一些修改和bug
Merge pull request #81 from tanwh/master

一些修改和bug