Single input line
Fix part 1 of #24
Completely fix #24