Close #77
Merge branch 'player-edit' into development