Handle new scope name for C++
Merge pull request #2 from maxbrunsfeld/patch-1

Handle new scope name for C++