Fixing index/entity errors
Merge pull request #230 from benjello/dev

Fixing index/entity errors