                 break;
 
                 case 'H':
-                if (Modem_CommandBuffer[i+1] == '0')
-                  Modem_CommandBuffer[i++]; 
+                switch(Modem_CommandBuffer[i++])
+                {
+                    case '0':
+                    suppressOkError = true;
                     Modem_Disconnect();
+                    break;
+
+                    /*case '1':
+                    // Future
+                    break;*/
+
+                    default:
+                    i--;                        // User entered ATH
+                    suppressOkError = true;
+                    Modem_Disconnect();
+                    break;
+                }
                 break;
                 
                 case 'Q':

    // Idle here until connected
    while (!wifly.isConnected())  {}
    C64Println(F("Incoming Connection"));
    //CheckTelnet();
    TerminalMode();
}
// ----------------------------------------------------------


;  // Keep this here to pacify the Arduino pre-processor

#define VERSION "0.07b3"

// Configuration 0v3: Wifi Hardware, C64 Software.

