Fix PSR2
Merge pull request #360 from ovr/fixes_00000000000000000000000000000000000000000000000000000001

Fix PSR2