Merge pull request #2 from TechZi/master

从yp分支拉取代码