Fixed unescaped and ambiguous characters in regexps
Merge pull request #20 from peter-volkov/greg_signatures_fix

Fixed unescaped and ambiguous characters in regexps
Merge pull request #21 from peter-volkov/master

fixed signatures