Handle new line properly.
Merge branch 'develop' of github.com:joshpc/Testosaurus into feature/automated