PR https://github.com/TUDelft-SPC-Lab/midge-code/pull/41 was merged without review. Implement the changes suggested by José in the review that he did after the merge.
