Added empty search functionality.
Merge remote-tracking branch 'origin/master'
Updated search script.
Solved merge conflicts.
Merge remote-tracking branch 'origin/master'
Updated search script.