Merge pull request #1 from Relicum/Spigot18

merge back