PSR-2 fixes
Merge pull request #24 from aik099/psr2-fixes

PSR-2 fixes