refacto
Merge pull request #368 from arnaudbey/refacto

refacto