Removing composite pattern
Fix conflicts
Merge pull request #21 from HallCat/fix_composite

Removing composite pattern