Merge branch 'master' of git.martlubbers.net:msc-thesis1617