Adding CScope support
Merge