Close #462 - shutdown gracefully