NOJIRA Cosmetic change
NOJIRA Patch expression parser to properly handle regexs