Fix line handling (including issue #36)