Merge b85bc29: Server can now be interrupted using stop button