Merge of eojthebrave:eojthebrave-3-player_initialization