Handle empty input
Merge branch 'parsing_improvements'