Merge branch 'release/0.5'
credits
Merge branch 'hotfix/credits' into develop