Fix PSR2
Merge pull request #65 from ovr/fixes

Fix PSR2