Merge pull request #1 from CCVT/master

的双方各