Fixed everything
Merge pull request #1 from CraftThatBlock/master

Fixed everything