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

Search module update