search improvements
Merge remote-tracking branch 'upstream/master'
Merge pull request #162 from jpecht/master

search improvements