Added a way to include object deffinitions
Merge branch 'smallerFiles'