Trying to clean up again.
Merge pull request #165 from j-rewerts/clean_master

A cleaner version of search.