Merge pull request #930 from beN39sGroup/master
Merge pull request #1 from PocketMine/master

Merge pull request #930 from beN39sGroup/master