Merge pull request #1 from rguetschow/master

pullling
Merge pull request #2 from rguetschow/deadly_skills

Merge pull request #1 from rguetschow/master