Bug fix version 1.1 for master
Merge branch 'master' into v.2index
made changes to version 2 index