Merge pull request #274 from b97pla/develop

Develop
Merge branch 'master' of github.com:SciLifeLab/scilifelab into develop