Branch for cplus assignment
Merge branch 'cplus' to 'master'