Here's the same changes now on github

Let me know if there are any issues.