Correct version embedding
Merge pull request #1413 from rleigh-dundee/cpp-version

C++: Correct version embedding