Changes to prevent Soql limit from being hit.
Merge pull request #16 from PassageTech/Fix-SOQL-Limit-Issue

Changes to prevent Soql limit from being hit.