class player replaced by a hash
Merge branch 'hotfix' into develop