Moves search functionality from GUI to Library
Moves search functionality from GUI to Library
Merge origin/master