Merge pull request #6 from LucasBrazi06/memory-optimization