Fixes Component dependencies
Merge branch 'pr/4'