sort of fixes #23

This strips \r's so that the tests pass on windows. I think there's still another bug lurking in there though.