Added some more regex metacharacters