More PSR-2 fixes
Merge pull request #51 from GrahamCampbell/psr-fixes

More PSR-2 Fixes