Merge pull request #7 from andeic/compositeSkeletonUpdate

fixed up a few small things in the code
Merge branch 'master' into abstractFactorySkeleton