Merge pull request #134 from mamarley/reconnectfix