Merge branch 'hotfix/1.01'
Deleted the phploc dependency
Merge branch 'hotfix/1.03' into develop