@rb3rg Could you create a pull request with the relevant changes?