added support for setting search options
added query string to collector and updated tests
fixed phpdoc
Merge pull request #462 from oohnoitz/master

added support for setting search options