Add index handling
Merge pull request #16 from streetlight/master

Add index handling