Gracefully handle restart before start
Merge pull request #5 from rowanhill/fix-initial-restart

Gracefully handle restart before start