edit by yeqing
Merge branch 'master' of https://github.com/snaketears/test