Fixed and improved service stop behaviour (Closes #149)