Pull Request

I'm trying to add these changes you made, thanks!