Handle new scope names for C++, Objective-C++
Merge pull request #16 from maxbrunsfeld/patch-1

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