Fixed many line endings and issue 21