Fixes for PSR-2 coding styles errors and warnings.
Merge pull request #7 from cyk/fix-psr2-errors

Fixes for PSR-2 coding styles errors and warnings.