Fix: Return array instead of null when no matches
Fix: Better vendor name
Mod: PSR4