Add watch task #4
Merge PullRequest #4