PSR-2 update
Merge pull request #4 from garoevans/feature/psr-2

PSR-2 update