Implemented issue https://github.com/Particular/ServiceControl/issues/40