diff --git a/README.md b/README.md
index a3f16d7..d94ab61 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,7 @@ All you need is an Azure Subscription to get started. If you don't have one, [cl
 -   Show diffs against last saved version
 -   Switch / Release API Revisions
 -   API Filter
+-   Policy Debugging on Self-Hosted Gateways
 
 ## Create an API Management instance using defaults
 
@@ -95,6 +96,9 @@ Please note: only JSON format is supported currently.
 ## API Filter
 ![apiFilter](resources/apiFilter.gif)
 
+## Self-Hosted Gateway Debugging
+![selfHostedDebugging](resources/selfdebug.gif)
+
 ## Intellisense for Policy Expressions.
 
 Follow instructions [here](https://github.com/microsoft/vscode-apimanagement/issues/37#issuecomment-516551741).
diff --git a/package-lock.json b/package-lock.json
index a85cb75..2bddb46 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "vscode-apimanagement",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
diff --git a/package.json b/package.json
index 8b49d77..82108e3 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "name": "vscode-apimanagement",
     "displayName": "Azure API Management",
     "description": "An Azure API Management extension for Visual Studio Code.",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "publisher": "ms-azuretools",
     "icon": "resources/apim-icon-newone.png",
     "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
diff --git a/package.nls.json b/package.nls.json
index d0e01fa..e80a7e5 100644
--- a/package.nls.json
+++ b/package.nls.json
@@ -44,5 +44,5 @@
     "azureApiManagement.generateFunctions": "Scaffold Azure Functions",
     "azureApiManagement.scaffoldAzureFunctions": "(Experimental Feature) Enables scaffolding Azure Functions from API definition.",
     "azureApiManagement.revisions": "API Revisions",
-    "azureApiManagement.setCustomHostName": "Set Service Custom Host Name"
+    "azureApiManagement.setCustomHostName": "Select Gateway Host Name"
 }
\ No newline at end of file
diff --git a/resources/selfdebug.gif b/resources/selfdebug.gif
new file mode 100644
index 0000000..7c43a89
Binary files /dev/null and b/resources/selfdebug.gif differ
diff --git a/src/commands/setCustomHostName.ts b/src/commands/setCustomHostName.ts
index 88fc681..d0f65ba 100644
--- a/src/commands/setCustomHostName.ts
+++ b/src/commands/setCustomHostName.ts
@@ -33,8 +33,9 @@ export async function setCustomHostName(context: IActionContext, node?: ServiceT
             }
         });
     }
-    const selfDefined = localize('', "Input a new custom host name");
+    const selfDefined = localize('', "Input a hostname (for self-hosted gateway)");
     allHostNames.push({label: selfDefined, hostName: ""});
+    window.showInformationMessage(localize("", "Select the gateway hostname for testing and debugging APIs."));
     const pick = await ext.ui.showQuickPick(allHostNames.map((s) => { return {label: s.label, gateway: s}; }), { canPickMany: false});
     if (pick.label === selfDefined) {
         const namespacePrompt: string = localize('urlPrompt', 'Enter Custom Host Name.');