Added watching
Merge pull request #53 from ShadowSam/master

Added watching