Merge branch 'hotfix/allow_Cscore'
Merge branch 'develop'
Merge branch 'develop'
Fixed errors and bumped version
Works now!
Merge branch 'hotfix/fix_esp_bug' into develop