refactorisation
Merge pull request #251 from arnaudbey/refacto

refactorisation