Merge pull request #7 from TechZi/master

从yp分支同步代码
Merge pull request #8 from TechZi/master

向yp分支推入代码
Merge pull request #11 from huahuajiujiu/master

change the capital letter