Fixes #141
Merge branch 'features/input' into develop