Fixed issue where the service would try to stop the scanner after the service had been unregistered
Merge pull request #91 from g-ortuno/small-improvements

Fixed issue where the service would try to stop the scanner after the