Composition improvements
Merge pull request #16 from wcandillon/composition

Composition improvements
Merge branch 'master' into composition