bugfix
Merge branch 'master' into develop
fixed mutliple indices process