Merge pull request #9 from pinguo-shenqiang/master

解决冲突
create conflict