Thanks for the PR! The changes look reasonable to me, even though I can't test them personally. Please run cargo fmt from the project root and then squash everything into 1 commit, so it can be merged.
I did test it myself and it works but I would prefer too if somebody tested it
I did test it myself and it works but I would prefer too if somebody tested it