Merge branch 'hotfix/composer_psr0' into develop
Merge branch 'master' into develop
Merge branch 'hotfix/v1.0' into develop
Merge branch 'master' into develop
Update documentation
Merge branch 'release/v1.0.1'