Merge pull request #1 from Ryan724/master

解决
hanyff update 2rd
Merge pull request #2 from yafeihan/master

PJ,ok