modified restart condition so that it applies tol_restart instead of tol. Not sure if this is algorithmically correct...
Merge branch 'working' into overlapping_dd