Merge pull request #15 from wcandillon/composition

Composition Refactoring
Composition improvements