bug fixed version 1.1
resolve merge conflict
r2_index completed