Merge pull request #30 from MarvinT/dev

bugfix for issue #28
import components
Merge remote-tracking branch 'upstream/dev' into dev