Modified in master
resolved merge between master and r2_index
ready for 2nd release