master bug fixed
Merge branch 'master' into r2_index
done for version2