Merge pull request #2 from Metamist/master

Merging
Fixed some bad stuff
Merge pull request #1 from MineFormers/master

Merging