Going to merge.
Merge branch 'master' of https://github.com/interwq/Composite