Merge pull request #3 from HuiLi/master

tongbu
完成
Merge pull request #119 from tongyou1992/master

111