Added indexes/settings for overview purposes
Merge remote-tracking branch 'origin/master'