Add an index to the demo
Merge branch 'develop'