* More refactoring
* Added call limits
* Refactored query structure
Merge pull request #3 from jamespowenjr/minor

Minor