Adding CRLF and CR support