Performance improvements.
Bug fixes.
Merge branch 'master' of https://github.com/sociam/indx
Merge branch 'master' of https://github.com/sociam/indx