Merge pull request #2 from miekki/master

Merge pull request #1 from miekki/deadly_skills
Merge pull request #3 from miekki/deadly_skills

Merge pull request #2 from miekki/master