Merge pull request #145 from ucsflibtopfstedt/master

code cleanup: line ending conversion and tab conversion.