c++ version
Merge branch 'master' of https://github.com/MCACASETOOLSLAB/group16-47-64-83