Conor/windows services

@remh 
@LeoCavaille did my change reflect your concern?