Added c++ support