Index fix
Merge branch 'develop' of https://github.com/bercium/imis.git into develop