Fixed player creation
Merge branch 'dev'