Merge pull request #104 from mamarley/disconnectdesyncfix