I'll try and work on this tomorrow and will submit a PR when it's sorted.
I'll try and work on this tomorrow and will submit a PR when it's sorted.