Fixes #180
Merge branch 'feature/component' into develop