Merge pull request #207 from mayabrandi/develop

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