add index
Merge branch 'hotfix/v0.0.13' into develop