hotfix
Merge pull request #231 from mayabrandi/develop

hotfix
Merge pull request #232 from SciLifeLab/develop

Develop