Indexing additions
Merge pull request #30 from Jeaye/master

Indexing additions. etc