Adding a TODO comment

Adding a TODO comment
Merge remote-tracking branch 'origin/master' into sample_game_ao