#41 #42 Add auto-shutdown