Minor modif in modules imported
Normalize by sample size

That is to give us the option of down-sampling from the complete
parameter file.
Merge remote-tracking branch 'origin/master'