Cleanup and CRLF fix.
Merge branch 'master' of https://github.com/rotators/fo2238