reduced amount of params to 2 for creating a component
Merge branch 'develop'