Merge branch 'hotfix/0.2'
Task class unused: deleted
Merge branch 'hotfix/0.3' into develop