2nd release

Bug fixed.
Merging master to r2_index