Merge pull request #1 from liroyma/master

pull
Merge pull request #2 from liroyma/deadly_skills

Merge pull request #1 from liroyma/master