Merge pull request #2 from TingoZhou/master

merge
提交

提交
Merge pull request #3 from TingoZhou/master

同步
Merge pull request #4 from fsiaonma/master

merge