Merge branch 'privat' into game_framework