PSR compliance
Merge pull request #1 from hoopyfrood/master

Merged, thanks Martin! (closes #1)