Resolve issues with composer.json
Merge branch 'hotfix/1.01'
Removed phploc
Merge branch 'hotfix/1.03'