Close #70
close #44 - search done