Merge pull request #672 from CanineHQ/perf/reduce-memory-usage