update
Service shutdown support
Update 2013-12-10