Fixing index
Edit
Merge branch 'master' into lisa
Merging Lisa's changes