Removed StringMatcher and added RegEx support
5 files changed