C++ metadata

Not sure if you want to take the version number bump or not...