Fixed some issues with line breaks and titles
Merge pull request #830 from KevWright/master

Fixed some issues with line breaks and titles