Update for/vtk branch based on recent commits on master

The goal of this MR is to update the for/vtk branch to include the recent changes in the master Branch (see #1 (closed))

A tag will be needed that can be used in VTK