fix cr and whitespace
Merge pull request #1 from atomicdryad/fix_cr_and_whitespace

fix cr and whitespace