added comments in Indexer
Merge remote-tracking branch 'origin/master' into Tom's-branch