merge choice and resume
Merge pull request #2 from pokemane/working

merge choice and resume