Finished debugging - need to merge.
Merge branch 'master' of github.com:interwq/Composite
Dumb typo fix...