Moved code up a level. Also fixed minor strict bug in Component
Merge pull request #6 from davidyell/master

Minor changes