Merge branch 'release/0.2.7' into develop
fix index reference
Merge branch 'develop'