connect message and disconnect message have been updated.
Merge branch 'debugging_phase2' into phase2