Minor patch from Amit, and remove CRLF