Bug fixes re time-outs and restarts
0.2.18
0.2.18