fixed compilation errors and removed ^M
Merge pull request #12 from benwaffle/master

fixed compilation errors and removed ^M