Merge pull request #80 from joular/54-windows-and-linux-line-endings-…

Merge pull request #80 from joular/54-windows-and-linux-line-endings-… #89