Fix for #957 - Line of code is to long, cannot be read
Merge pull request #958
[#958] Split arguments in different lines

Follows PSR-2
Merge pull request #958 into master