cleaned up IndexScan and added test
Merge pull request #46 from timbokopter/feature/cleanup_IndexScan

cleaned up IndexScan and added test