Search module update
Search module update
Merge pull request #829 from sexnothing/develop

Search module update