diff --git a/i18n-sample/.gitignore b/i18n-sample/.gitignore
index 46c692aa..f4be32ab 100644
--- a/i18n-sample/.gitignore
+++ b/i18n-sample/.gitignore
@@ -1,3 +1,3 @@
 out
 node_modules
-package.nls.*.json
+package.nls.*.json
\ No newline at end of file
diff --git a/i18n-sample/.vscode/launch.json b/i18n-sample/.vscode/launch.json
new file mode 100644
index 00000000..30625e88
--- /dev/null
+++ b/i18n-sample/.vscode/launch.json
@@ -0,0 +1,17 @@
+// A launch configuration that compiles the extension and then opens it inside a new window
+{
+    "version": "0.1.0",
+    "configurations": [
+        {
+            "name": "Launch Extension",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": ["--extensionDevelopmentPath=${workspaceRoot}" ],
+            "stopOnEntry": false,
+            "sourceMaps": true,
+            "outFiles": [ "${workspaceRoot}/out/src/**/*.js" ],
+            "preLaunchTask": "npm"
+        }
+    ]
+}
diff --git a/i18n-sample/.vscode/settings.json b/i18n-sample/.vscode/settings.json
new file mode 100644
index 00000000..d1371333
--- /dev/null
+++ b/i18n-sample/.vscode/settings.json
@@ -0,0 +1,9 @@
+// Place your settings in this file to overwrite default and user settings.
+{
+    "files.exclude": {
+        "out": false // set this to true to hide the "out" folder with the compiled JS files
+    },
+    "search.exclude": {
+        "out": true // set this to false to include "out" folder in search results
+    }
+}
\ No newline at end of file
diff --git a/i18n-sample/.vscodeignore b/i18n-sample/.vscodeignore
new file mode 100644
index 00000000..5ff3c193
--- /dev/null
+++ b/i18n-sample/.vscodeignore
@@ -0,0 +1,9 @@
+.vscode/**
+.vscode-test/**
+out/test/**
+test/**
+src/**
+**/*.map
+.gitignore
+tsconfig.json
+vsc-extension-quickstart.md
diff --git a/i18n-sample/README.md b/i18n-sample/README.md
index 96cb133d..953ddfb4 100644
--- a/i18n-sample/README.md
+++ b/i18n-sample/README.md
@@ -99,4 +99,4 @@ Hook up the vscode-nls-dev functions to gulp so that you can just run `vsce pack
 
 ## 0.0.1:
 
-Manually transform the calls to localize to illustrate explicitly what is going on.
\ No newline at end of file
+Manually transform the calls to localize to illustrate explicitly what is going on.
diff --git a/i18n-sample/i18n-sample-0.0.1.vsix b/i18n-sample/i18n-sample-0.0.1.vsix
new file mode 100644
index 00000000..b4345ef8
Binary files /dev/null and b/i18n-sample/i18n-sample-0.0.1.vsix differ
diff --git a/i18n-sample/package.json b/i18n-sample/package.json
index 4036ae38..49426d5c 100644
--- a/i18n-sample/package.json
+++ b/i18n-sample/package.json
@@ -48,4 +48,4 @@
 	"dependencies": {
 		"vscode-nls": "^2.0.2"
 	}
-}
\ No newline at end of file
+}
diff --git a/i18n-sample/package.nls.ja.json b/i18n-sample/package.nls.ja.json
new file mode 100644
index 00000000..21ddd66d
--- /dev/null
+++ b/i18n-sample/package.nls.ja.json
@@ -0,0 +1,4 @@
+{
+    "extension.sayHello.title": "こんにちは",
+    "extension.sayBye.title": "さようなら"
+}
diff --git a/i18n-sample/src/command/sayBye.nls.ja.json b/i18n-sample/src/command/sayBye.nls.ja.json
new file mode 100644
index 00000000..491dfe9d
--- /dev/null
+++ b/i18n-sample/src/command/sayBye.nls.ja.json
@@ -0,0 +1 @@
+["さようなら"]
diff --git a/i18n-sample/src/command/sayBye.nls.json b/i18n-sample/src/command/sayBye.nls.json
new file mode 100644
index 00000000..05365ab3
--- /dev/null
+++ b/i18n-sample/src/command/sayBye.nls.json
@@ -0,0 +1,4 @@
+{
+  "messages": ["Bye"],
+  "keys": ["sayBye.text"]
+}
diff --git a/i18n-sample/src/command/sayBye.ts b/i18n-sample/src/command/sayBye.ts
index 5c9a636f..bdcbfd90 100644
--- a/i18n-sample/src/command/sayBye.ts
+++ b/i18n-sample/src/command/sayBye.ts
@@ -11,4 +11,4 @@ const localize = nls.loadMessageBundle();
 export function sayByeCommand() {
 	const message = localize('sayBye.text', 'Bye')
 	vscode.window.showInformationMessage(message);
-}
\ No newline at end of file
+}
diff --git a/i18n-sample/src/extension.nls.ja.json b/i18n-sample/src/extension.nls.ja.json
new file mode 100644
index 00000000..5206d922
--- /dev/null
+++ b/i18n-sample/src/extension.nls.ja.json
@@ -0,0 +1 @@
+["こんにちは"]
diff --git a/i18n-sample/src/extension.nls.json b/i18n-sample/src/extension.nls.json
new file mode 100644
index 00000000..419c5cc8
--- /dev/null
+++ b/i18n-sample/src/extension.nls.json
@@ -0,0 +1,4 @@
+{
+  "messages": ["Hello"],
+  "keys": ["sayHello.text"]
+}
diff --git a/i18n-sample/src/extension.ts b/i18n-sample/src/extension.ts
index 8e96f1de..c48a15b4 100644
--- a/i18n-sample/src/extension.ts
+++ b/i18n-sample/src/extension.ts
@@ -24,4 +24,4 @@ export function activate(context: vscode.ExtensionContext) {
 }
 
 export function deactivate() {
-}
\ No newline at end of file
+}