Git Issue #5
Git Issue #3 and enhanced disconnect handling
Signed-off-by: Mark <markle12@gmail.com>
Git issue #2