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

Add component support