added component handling
Merge pull request #2 from ukramer/issue-#1

fixed #1: added component handling