Just cleaning a bit the regex.
Merge branch 'regex-cleanup' into peerlibrary