PSR-2
Merge pull request #5 from glovell/master

PSR-2