fixes and suggestions

Merged Lupo Pasini, Massimiliano requested to merge massi_fixes_and_suggestions into master

Merge request reports