Merge pull request #24 from wcandillon/refactoring

Refactoring
Refactoring