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