Add component support
Merge pull request #1 from RobLoach/component

Add component support