Whitespace / line-ending changes
Merge pull request #175 from tml/master

Whitespace / line-ending changes