checked improved memory allocation profile with massif
Merge branch 'feat_scanner'