Adding auto-shutdown handlers [Resolves Issue #15]