Proper guard on freeStorage
Merge pull request #2 from oneam/mem-cleanup

Proper guard on freeStorage