Add delayed crash and timestep resets (fixes issue#6)