Wrap lines appropriately
Merge pull request #1367 from alex/line-length

Wrap lines appropriately