Should now handle CRLF line endings