Renamed ImagesIndexer to ImpcImagesIndexer at Jonathan/Jeremy's suggestion. Added more tests.
Merge origin/master