Switch to deferred
Merge pull request #2 from r0man/deferred

Switch to deferred