Merge?

hi don't know if you want this or not i just forked in case it if you didn't.