added indexing
Merged master and branch