Added support for C++ on Mac OSX and Linux