Refactoring + ajout codes erreurs
Merge branch 'master' into denis