Merge from master
Forgot to update result visualization as well
A little clarification added to user guide