Fixes #181
Merge pull request #186 from Qowyn/spiderfix

Fixes #181