Disconnect if a sync times out. Fixes issue 496
Merge pull request #499 from godarklight/issue-496

Fix issue #496
Merge branch 'master' into noHijacking