watch dog added
Merge remote-tracking branch 'bajric/develop' into develop