bug fix, v1.1 for index
resolve merge conflict
v1.0.1