Merge changes to code base since Feb/March#15

hpeltzsmalle wants to merge 9 commits into

Pocar-Lab:mainPocar-Lab/SPE-Analysis:mainfrom

hpeltzsmalle:mainhpeltzsmalle/SPE-Analysis:mainCopy head branch name to clipboard