Merge pull request #11 from JohnCny/master

merge
Merge pull request #12 from JohnCny/master

merge
重写
Merge pull request #35 from tanwh/master

重写