Better PSR 1 and 2 compatibility
Merge pull request #2 from rkrx/patch-1

Better PSR 1 and 2 compatibility