Merge pull request #156 from Galithil/master

Review
Merge pull request #157 from Galithil/master

some extra changes
Merge branch 'master' of https://github.com/SciLifeLab/status