Merge branch 'develop'
Fix badge
Merge branch 'master' into develop