First refactoring of the regexp
Merge branch 'develop' of https://github.com/MISP/MISP into develop