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

PSR-2 Fixes