PSR-4 + fixes
Merge branch 'develop'