Merge pull request #5 from jperrine/development

Image module
Adding support for multi-word queries