refacto
Merge pull request #391 from arnaudbey/refacto

refacto