Fixed memory problem
Merge branch 'EDMdev' of github.com:ETHZ/ASAnalysis into EDMdev