Merge tag 'revert-to-psr0' into develop

0.9.5
fixed version checking
Merge branch 'release/fixed-version-checking'