psr-4
Merge pull request #234 from olivervogel/master

psr-4