Merge pull request #157 from thecodingmachine/fixing_long_disconnect