Separate query into its own class
Merge pull request #14 from LinuxJedi/query_class

Separate query into its own class