Added flare search. Search function does not yet work.
Merge remote-tracking branch 'origin/master'