Merge pull request #208 from TheBlueMatt/2018-10-reconnect-fixes