Merge pull request #156 from stef145g/develop

Ensure line endings are correct for different OS