Fix and improve PSR-4, ref #5