Merge pull request #17 from chenyuqing/develop

chp3 full version