Ready for package
Use C++ binding instead of call.
Fixes