bug fix in master
resolving conflicts in merge master and r2_index
Coding for release 2 r2_index done