correct psr-4 namespace
Merge remote-tracking branch 'origin/master'