Merge pull request #4 from Angelfirenze/master

Merge pull request #2 from Angelfirenze/deadly_skills
Merge pull request #6 from Angelfirenze/deadly_skills

Merge pull request #4 from Angelfirenze/master