Fixes and docs
Fix cpp tests
Fix typo in README
Merge branch 'feature-merge'