merge?

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