Merging develop into main

Kostis Trantzasrequested to merge
develop into main

Incorporating fixes for: #16 (closed) #17 (closed) #18 (closed)

Merge request reports