Switch to PSR-4
Merge remote-tracking branch 'origin/psr4'

* origin/psr4:
  Switch to PSR-4
update CHANGELOG