Fix n + 1 condition with database query
Merge pull request #14 from NathanielWroblewski/feature/nw-refactorings

Fix n + 1 condition with database query