removed element_type index
Merge branch 'master' of github.com:StartTheShift/thunderdome