CHANGED deleted some imports + commentary added
CHANGED some method names
CHANGED some calls from search hosts
Merge branch 'update-1' into fabian
UPDATED fabian changes