WIP: c++ build
merge bug 59 fix to master branch
WIP: c++ build