Regexfilter

Reorganised my branches (so that my master matches the upstream master) and found my previous pull request - #45 - has no commits. Oops, so re-doing the pull request.

See the old pull request for discussion so far.