fixes for Regex implementation
Merge pull request #14 from jrsearles/regex

updated regex, fixed issues with prior implementation