Updated search features
Merge pull request #3 from tombrightbill/search_features_updated

Updated search features