Merge pull request #126 from nealcpeters/search

Search
Merge branch 'master' into search