added cpp stubgeneration again. not tested yet