Shorter version
Merge branch 'short_resume'