Add C++ version and comment