merge?

These changes are great!
Never tried to merge to a fork, hope this works as I hope.