Improve resume behavior
Fix #736 add restore option