Removed RegEx for the moment as we could not get it to work
Merge remote-tracking branch 'origin/Adding_C++-Igloo' into Adding_C++-Igloo