PSR2 fixes
Merge pull request #2 from assertchris/psr2-fixes

PSR2 fixes