This is my pull request. I hope it works

I did not have to chance a lot of things.