Merge pull request #212 from TheBlueMatt/2018-10-two-updates-disconnect