Added check for "deadness" in the got_activity handler
Merge remote-tracking branch 'DamonOehlman/patch-wait-timer-not-found'

closes #13
Adjust to this project's coding style