Merge branch 'reflection_development' of gitlab.science.ru.nl:kuhnen/ssproject1617