use code from merge with uncertainty-visualisation branch
Merge remote-tracking branch 'origin/master' into module_renaming