Started updating and man, that's a lot.

It's even harder because I can't play Minecraft at the moment and I have to guess some things...
Merge pull request #87 from pazzoeo/patch-6

Started updating and man, that's a lot.