Merge pull request #110 from kakserpom/refactoring

use StaticObjectWatchdog
ClassWatchdog bugfix