     }
     Serial.print(OK_MSG);
     
+#ifdef USE_DHCP
     /* Wait for DHCP to complete */
     do
     {
       delay(100); // ToDo: Insert a DHCP timeout!
-    } while (!cc3000.checkDHCP()); 
+    } while (!cc3000.checkDHCP());
+#endif
   
     /* Display the IP address DNS, Gateway, etc. */  
     //while (! displayConnectionDetails()) {

  }
  Serial.print(OK_MSG);
  
  ensureWifiConnection();
  
}

void initWifi() {
  
  /* Initialise the module */
  Serial.print(F("wifi "));
    
  if (!cc3000.begin())
  {
    Serial.print(FAIL_MSG);
