Merge branch 'master' into linnea
Merge and changes to samples
Merge branch 'linnea'
Small but critical changes to samples
Merge branch 'master' into linnea
Merge branch 'linnea'
Merge branch 'master' into oskar