Adding LeandroLovisolo for PR #50 which ended up having duplicate functionality to a previous PR.