Merge pull request #1 from CCVT/master

的双方各
Merge pull request #4 from baoluobala/master

Merge pull request #1 from CCVT/master