diff --git a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.cproj b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.cproj
index e25100f39..3bb685b49 100644
--- a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.cproj
+++ b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/RTOSDemo.cproj
@@ -461,14 +461,18 @@
     <GenerateEepFile>True</GenerateEepFile>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\FreeRTOS-Plus\Demo\Common\FreeRTOS_Plus_CLI_Demos\File-Releated-CLI-commands.c">
+    <Compile Include="..\..\..\FreeRTOS-Plus\Demo\Common\FreeRTOS_Plus_CLI_Demos\File-Related-CLI-commands.c">
       <SubType>compile</SubType>
-      <Link>src\File-Releated-CLI-commands.c</Link>
+      <Link>src\File-Related-CLI-commands.c</Link>
     </Compile>
     <Compile Include="..\..\..\FreeRTOS-Plus\Demo\Common\FreeRTOS_Plus_CLI_Demos\Sample-CLI-commands.c">
       <SubType>compile</SubType>
       <Link>src\Sample-CLI-commands.c</Link>
     </Compile>
+    <Compile Include="..\..\..\FreeRTOS-Plus\Demo\Common\FreeRTOS_Plus_CLI_Demos\UDP-Related-CLI-commands.c">
+      <SubType>compile</SubType>
+      <Link>src\UDP-Related-CLI-commands.c</Link>
+    </Compile>
     <Compile Include="..\..\..\FreeRTOS-Plus\Demo\Common\FreeRTOS_Plus_FAT_SL_Demos\CreateExampleFiles\File-system-demo.c">
       <SubType>compile</SubType>
       <Link>src\File-system-demo.c</Link>
diff --git a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/FreeRTOSIPConfig.h b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/FreeRTOSIPConfig.h
index 0ec023489..ffaf4ecf1 100644
--- a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/FreeRTOSIPConfig.h
+++ b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/config/FreeRTOSIPConfig.h
@@ -217,7 +217,7 @@ generate replies to incoming ICMP echo (ping) requests. */
 
 /* If ipconfigSUPPORT_OUTGOING_PINGS is set to 1 then the
 FreeRTOS_SendPingRequest() API function is available. */
-#define ipconfigSUPPORT_OUTGOING_PINGS				0
+#define ipconfigSUPPORT_OUTGOING_PINGS				1
 
 /* If ipconfigSUPPORT_SELECT_FUNCTION is set to 1 then the FreeRTOS_select()
 (and associated) API function is available. */
diff --git a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/main_full.c b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/main_full.c
index b03439c0f..22376afca 100644
--- a/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/main_full.c
+++ b/FreeRTOS/Demo/CORTEX_M4_ATSAM4E_Atmel_Studio/src/main_full.c
@@ -154,6 +154,11 @@ extern void vRegisterSampleCLICommands( void );
  */
 extern void vRegisterFileSystemCLICommands( void );
 
+/*
+ * Register the UDP related commands that can be used with FreeRTOS+CLI.
+ */
+extern void vRegisterUDPCLICommands( void );
+
 /*-----------------------------------------------------------*/
 
 /* The default IP and MAC address used by the demo.  The address configuration
@@ -191,12 +196,11 @@ xTimerHandle xTimer = NULL;
 	}
 	#endif
 
-	/* Register generic commands with the FreeRTOS+CLI command interpreter. */
+	/* Register example generic, file system related and UDP related CLI 
+	commands respectively. */
 	vRegisterSampleCLICommands();
-
-	/* Register file system related commands with the FreeRTOS+CLI command
-	interpreter. */
 	vRegisterFileSystemCLICommands();
+	vRegisterUDPCLICommands();
 
 	/* Initialise the network interface.  Tasks that use the network are
 	created in the network event hook when the network is connected and ready
@@ -376,6 +380,31 @@ void vFullDemoTickHook( void )
 	/* Call the queue set ISR test function. */
 	vQueueSetAccessQueueSetFromISR();
 }
+/*-----------------------------------------------------------*/
+
+/* Called automatically when a reply to an outgoing ping is received. */
+void vApplicationPingReplyHook( ePingReplyStatus_t eStatus, uint16_t usIdentifier )
+{
+	/* This demo has nowhere to output any information so does nothing. */
+	( void ) usIdentifier;
+	
+	switch( eStatus )
+	{
+		case eSuccess	:
+			break;
+
+		case eInvalidChecksum :
+			break;
+
+		case eInvalidData :
+			break;
+
+		default :
+			/* It is not possible to get here as all enums have their own
+			case. */
+			break;
+	}
+}