Fixes #169
Merge branch 'refactoring/input' into develop