Squashed spider additions
Merge pull request #388 from Ironholds/master

Squashed spider additions