Merge pull request #4 from pinguo-liaofeng/master

我知道不能合并