Better memory management
Merge branch 'master' of github.com:nycresistor/TotU