Merge branch 'master' into develop
simplification de la regex (retrait d'échappements non nécessaires)
Merge pull request #20 from Linedwell/develop

Develop