reworking of watchdog
Merge pull request #18 from massemanet/watchdog-fixes

reworking of watchdog