Merge pull request #1 from codeInMinecraft/master

pull1