Make restart conditional
Merge pull request #151 from danmcp/master

Make restart conditional