#54 Added shutdown