Merge pull request #4 from miekki/master

Merge pull request #3 from miekki/deadly_skills