Minor changes to read_some_lines
Tidy up
Merge remote-tracking branch 'upstream/master'