chp1 not complete
Merge pull request #22 from kfeng123/develop

chp1 not complete