improved bundle search algorithm

see issue #85