resque ff
Merge pull request #22 from swytman/dev

resque ff