remove CRLF
merge windows branch