Added C++ support.