Squashed 'ivernetp/' changes from 01c7f2e..e207a42

e207a42 Fix bug: crashes if no lines were read

git-subtree-dir: ivernetp
git-subtree-split: e207a42e38d27179dfcd9e4d5be4f650eb06189d
Merge commit '56a37f592a9743fb0c77eef1d783de59be1ac135'