More line wrapping
Merge pull request #1055 from alex/linewrap

More line wrapping