Merge branch 'Add-the-index'