Fixing memory usage issue
Merge pull request #1 from nicolas-clarolab/master

Fixing memory usage issue