Merge pull request #135 from prattmic/signal_cleanup