more search options
Merge pull request #88 from teharrison/master

more search options