Moved timing of stopping service
Merge branch 'master' of https://github.com/ToyDragon/CodeNameImpregnable