Now PSR-4 compliant
Merge origin/master