Merge pull request #2 from samsoe/master

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

Merge pull request #2 from samsoe/master