closes #58 and some minor fixes to resume feature
merge