Merge pull request #3 from Relicum/Spigot18

Merge pull request #2 from Relicum/master
Merge pull request #4 from Relicum/master

Merge pull request #3 from Relicum/Spigot18