Bug Fixes

Fixed Connect/Disconnect Error
Fixed Keep Alive Bug