Issue75 index search algorithm

see issue #75 
@damienpicard : does this go away when you address the above comment?