Sorry for the delay @TethysPlex and thanks for the PR.
I have reviewed, made some light tweaks and merged it