Close #34
Merge branch 'player-profile' into development