Player constructor
Merge branch 'dev'