Refactoring a few querying methods
Merge pull request #4 from camertron/master

Refactoring a few querying methods