switch to PSR-4
Merge branch 'master' into develop
Merge branch 'release/0.4.0'