Merge branch 'Matthias' of https://git.tk.informatik.tu-darmstadt.de/julien.gedeon/bp-scopviz into Matthias