Commit test
Fixes #1
Fixes #4
Merge branch 'feature/component-system' into develop