Basic CPP support (#136)
Fix a nesting bug in CPP