Merge pull request #133 from mamarley/clientreconnectfix