Code refactoring
Merge pull request #18 from wcandillon/composition

Code refactoring