Spork support added
Merge pull request #3398 from Andrew8xx8/spork

Spork support added