Merge pull request #2 from rodbeh/master

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

Merge pull request #2 from rodbeh/master