Handle new scope names for C++, Objective-C++
Merge pull request #39 from maxbrunsfeld/master

Handle new scope names for C++, Objective-C++