ff resque
Merge pull request #21 from swytman/dev

ff resque