Merge pull request #1 from joelbirchler/master

Defer flag