Deadly skills

deadly_skills from master to master