Merge pull request #8 from elo2112/master

Mostly indexing updates