Merge branch 'master' of git.ygdrassil:msc-thesis1617