Merge pull request #1 from kmaglione/master

First crack at restartlessness.