Cherry-pick commit 64b0a202fb: Adding index by Vijaycs85
Merge pull request #31 from brianV/add-index

Cherry-pick commit 64b0a202fb: Adding index by Vijaycs85