Merge pull request #25 from leoherbie/master

line endings