Fine tuning on the already merged branch issue40 from MR38

Implemented/Implementing further comments from MR38

Merge request reports

Loading