This commit fixes the current master branch state to fix spigot servers. PLS LRN TO TEST UR CODE.
Merge pull request #21 from SupaHam/friendly-spigot-hack-fix

Fix spigot hack compatiblity.