Fix: Return array instead of null when no matches
Fix: Better vendor name
Mod: PSR4
Merge branch 'develop'

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