PSR2 compatibility
Merge pull request #62 from egeloen/f-psr2

PSR2 compatibility