I changed a few things
Merge pull request #1 from jojo014/master

I changed a few things