fix psr-0
psr-0
Merge branch 'master' into api-key