Merge branch 'master' of https://gitlab.science.ru.nl/mlubbers/ssproject1617