a master bug fix
a new index feature added
conflict resolved