Merging my changes back into your code.

It should be able to auto-merge since I merged everything manually.
Also I do not seam to have write access to your fork which means someone else will have to accept the pull request.

If you do not know what a pull request is, it is effectively a way to merge code between forks, I have already created a pull request from your code to a branch of the main project.