CPP support added

No empty line here.