Merge pull request #6 from Buom01/fix_memory
Fixing various memory issues
MERGE COMMIT
GitHub sha: 98092daa