Merge pull request #22 from wcandillon/refactoring

Refactoring
Refactoring