updated for new cpp
Merge branch 'v3'