cross platform line endings
Merge pull request #1650 from stefanpenner/line-endings

 cross platform line endings