More regex additions/fixes
Merge pull request #1097 from Bart39/dev

More regex additions/fixes