Composition improvements
Merge branch 'master' into composition
Merge pull request #17 from wcandillon/composition

Composition Refactoring