v1 bug fixed'
merge v2_index to master