resume needs to call "next", too
Merge origin/master