Clean and Bigmem feature
Merge pull request #1 from Tigrouzen/patch-1

Clean and Bigmem feature