Added support for a second line terminator (eg. \n and \r)