Added mac line ending support