Less permissive
Merge branch 'master' into better-tests
Fix regexes
Merge pull request #51 from AnyFetch/better-tests

Better tests, less permissive