Added composition
Merge branch 'master' of https://github.com/perks/pumpkin