Merge pull request #151 from danmcp/master

Make restart conditional
Add better breaks around test sections