moved carriage return fix to higher up
tests pass, changing naming convention
tests pass w 3
bump version
Merge pull request #1 from c4ssio/master

whole lotta goodness