Reformat some lines that were too long
Merge pull request #153 from caktus/feature/lines-too-long

Reformat some lines that were too long
resolve conflicts