Merge pull request #1 from Relicum/Spigot18

merge back
Merge pull request #2 from Relicum/master

Merge pull request #1 from Relicum/Spigot18