Fixed bug.
Merge branch 'V1.1' into Minecraft-Port
updated