Moved argument parsing outside the Indexer class
Merge branch 'master' of github.com:vdevos/2ID26