Merge pull request #1 from happyming1986/master

wo jia de 1ge wenjian
刘刚做的任务
lam chang this