PSR-2 fixes
Merge pull request #6 from HappyR/psr-2_fixes

PSR-2 fixes