Merge pull request #1 from yaodream/master

commit from 375367545@qq.com
new