line ending changes
Merge pull request #44 from yushan87/master

Some line ending changes