Merge branch 'dev'
Fixed player creation