Added serveral new features when searching by query
Fixed docblock errors
Merge pull request #4 from urthecast/master

Added serveral new features when searching by query