Wrapped Jon's search code.
Merge pull request #12 from kiyo-masui/wrap_search

Wrapped Jon's search code.