Fixed linebreaks on Mac OSX
Fixed tabbing.
Merge pull request #2624 from benjamesward/master

Fixed linebreaks on Mac OSX