Working C++ interface with test.
Merging