Replace regexes with CompCore Patterns Class
Merge pull request #27 from warriordog/master

Replace regexes with CompCore Patterns Class