If there is desire I can try to upload a PR with my changes
If there is desire I can try to upload a PR with my changes