Fix Index.java in release v1.;
complete Code
Merge branch 'master' into r2_team1
final fix
Merge branch 'master' into r2_team1