fixed errors and index name handling

Signed-off-by: Dominic Böttger <Dominic.Boettger@inspirationlabs.com>
Merge remote-tracking branch 'origin/master'
version number