CPP is actually the C++ compiler
Merge pull request #186 from boegel/v1.4.x

CPP is actually the C++ compiler