CG implementation changes
Merge branch 'master' of https://github.com/alexge233/cgpp