Added a function to return the indexes
Merge remote-tracking branch 'origin/master'