Index renaming back again
Merge branch 'master' of https://github.com/signumsoftware/framework