DSP-1479: Make initial delay unconditional
Merge pull request #23 from riptano/DSP-1479

DSP-1479: Make initial delay unconditional