Escape more regex special characters

Closes #24.  Closes #16.