remove CRLF
merge windows branch
remove warning
Merge pull request #1 from pezy/master

Update from original