Merge branch 'feature/components' into develop

Closes #13.