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

Search module update