Added test; removed trailing whitespaces
Remove old CRLF hack; Fix style
Style fixes