Tonio changes, please take a look

take a look and if it's fine I will merge it to our master :)