PR working
PR working 2
more robust
deleted some useless comments
Merge branch 'master' into fluidprop