Performance

merge performance branch with master
Align the parameters of a method call if they span more than one line.