first watch commit
Merge pull request #553 from WellingGuzman/watch

first watch commit