Merge pull request #17 from wcandillon/composition

Composition Refactoring
Code refactoring