just fixed bug in master
just merged master and r2_index
one more change after merge