Added better watch support handling on sync
Merge pull request #354 from dshurt/master

Added better watch support handling on sync