Added C++ compilation stuff