Go psr-2
Merge pull request #38 from lucasmichot/psr2

Small PSR-2 fixes