Added line end delimiter and null string support