massive change to cpp
Merge pull request #10 from zgao/master

massive change to cpp