Regex finetuning
Merge branch 'master' of git@github.com:gregorybesson/AdfabCore.git