Moved contented from base to index and added check
Merge pull request #30 from ppapadeas/index_base_fix

Moved contented from base to index and added check