Merge dev into master

#58 (closed) and more

Merge request reports

Loading