Fixes #171
Fixes #172
Merge branch 'enhancement/input' into develop