Fixes #24
Fixes #23
Merge branch 'fixes/component' into develop