Updates to the index
Merge branch 'master' into pauls-slide-updates