merged
Merge pull request #31 from tomsword/search-improvements

merged