Merging into master for version 1.0

Merge request reports

Loading