Added flexibility to C++ standalone (#152)