Fixes #142
Merge branch 'refactoring/components-handler' into develop