fixed master version 1.1
resolved conflict
r2_index feature set done