Fix: Shutdown option

Closes PR #37