support for resume
Merge branch 'jannson'