Cherry-pick commit 64b0a202fb: Adding index by Vijaycs85

This adds the index from Vijaycs85's fork of the tool.