More robust watching
Merge pull request #3 from boblauer/better-watching

More robust watching