crlf and whitespace cleanup
Merge pull request #1 from nyov/canar

crlf and whitespace cleanup