upd code
upd
Merge pull request #5 from coderiver/index-fixes

Index fixes