Added c++, fixed makefile
Added c++, fixed makefile