Multiple improvements to accurately track state of the remote scanner
Merge pull request #107 from arkenoi/master

Multiple improvements to accurately track state of the remote scanner by arkenoi

@Arkanoi Thank you very much for fixing this issue and helping!
+1 to the hero ^^