Finish feature-1-index
Merge pull request #1 from josesalomon/develop

Finish feature-1-index