Closes issue #1 - auto shut-off