Optimization to speed things up and make (many) fewer requests.
Merge pull request #3 from mmccurdy07/master

Optimization to speed things up and make (many) fewer requests.