From bbfc806124ffd10f0f4b1a292e51931924a8efad Mon Sep 17 00:00:00 2001
From: Pedro Lamas <pedrolamas@gmail.com>
Date: Fri, 21 Aug 2020 10:55:07 +0100
Subject: [PATCH] More updated following PR comments