Change index
hotfix iss53 on index
Some other fix
Merge iss53 with master