Merge pull request #25 from JohnCny/master

merge
Merge pull request #26 from JohnCny/master

merge
[mod]几个bug
Merge pull request #39 from tanwh/master

几个bug