Merge pull request #130 from michaelclelland/master

Update to search #6634