Workaround for compiler bug in Visual Studio
Fixed line endings
Merge pull request #744 from peastman/master

Workaround for compiler bug in Visual Studio