rebased
finished coding for v2.0
new changes2
removed headers
Merge commit '9557dc538fb8606063ca7517b3215085c5ff0131' into r2_index