Merge pull request #102 from bendiy/master

More fun with line endings