improved spork support
improved spork support