Finished trivial functionality for the Indexer
Merge branch 'master' of github.com:vdevos/2ID26