Fixed #904
Fixed #906
Merge branch 'master' of https://github.com/mc-server/MCServer