Add component support
Merge pull request #1 from kewah/master

Add component support