fix #151
Fix vtk 5 compatibility
Merge branch 'master' into experimental