Merge pull request #2 from ctesniere/refacto

Refacto