PSR-2 fixes
Merge pull request #255 from lucasmichot/psr2-fixes

PSR-2 fixes