Merge branch 'develop' of github.com:SciLifeLab/scilifelab into develop
fixed formattingä
added custom analysis options