Switch to psr-0
Merge branch 'hotfix/1.4.2'