PSR compliant, thanks to the work by SammyK
Merge pull request #19 from frak/master

PSR compliant, thanks to the work by SammyK