version 1.2
merge conflicts resolved
coding finished for r2_index branch