Improve escaping in a regex, add docs and another test

Improve escaping in a regex, add docs and another test #620