Resume
Merge origin/master
Removed and readded resume core