C++ version support (#87)