bug fixed version 1.1
resolved merge conflict
finished r2_index