Use PSR-4
Merge pull request #301 from Tobion/patch-1

Use PSR-4