diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..76cd57b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,16 @@
+---
+name: Bug report
+about: Create a issue to help us improve
+---
+
+<!-- Fill in the information needed -->
+- iotedgedev Version:
+- Python Version:
+- Pip Version:
+- Development machine OS Version:
+- IoT Edge device OS Version:
+
+Steps to Reproduce:
+
+1.
+2.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..de27153
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,7 @@
+---
+name: Feature request
+about: Suggest an idea for IoT Edge and IoT Edge development tools
+
+---
+
+<!-- Describe the feature you'd like. -->
\ No newline at end of file
diff --git a/iotedgedev/cli.py b/iotedgedev/cli.py
index 2fe5b45..c85aa25 100644
--- a/iotedgedev/cli.py
+++ b/iotedgedev/cli.py
@@ -85,13 +85,13 @@ def docker():
               type=click.Choice(["csharp", "nodejs", "python", "csharpfunction"]),
               help="Specify the template used to create the default module")
 @with_telemetry
-def create(name, module, template):
+def new(name, module, template):
     utility = Utility(envvars, output)
     sol = Solution(output, utility)
     sol.create(name, module, template)
 
 
-main.add_command(create)
+main.add_command(new)
 
 
 @solution.command(context_settings=CONTEXT_SETTINGS,
@@ -103,7 +103,7 @@ def init():
     utility = Utility(envvars, output)
 
     if len(os.listdir(os.getcwd())) == 0:
-        solcmd = "iotedgedev solution create ."
+        solcmd = "iotedgedev new ."
         output.header(solcmd)
         utility.call_proc(solcmd.split())
 
diff --git a/iotedgedev/envvars.py b/iotedgedev/envvars.py
index f180959..5c44f7c 100644
--- a/iotedgedev/envvars.py
+++ b/iotedgedev/envvars.py
@@ -20,7 +20,7 @@ class EnvVars:
         current_command = Args().get_current_command()
         # for some commands we don't want to load dotenv
         # TODO: temporary hack. A more grace solution would be a decorator on the command to indicate whether to bypass env
-        self.bypass_dotenv_load_commands = ['solution init', 'solution e2e', 'solution create', 'create', 'simulator stop', 'simulator modulecred']
+        self.bypass_dotenv_load_commands = ['solution init', 'solution e2e', 'solution new', 'new', 'simulator stop', 'simulator modulecred']
         self.bypass = self.is_bypass_command(current_command)
         # for some commands we don't want verbose dotenv load output
         self.terse_commands = ['', 'iothub setup']
@@ -151,7 +151,7 @@ class EnvVars:
                 else:
                     self.DOCKER_HOST = None
             except Exception as ex:
-                msg = "Environment variables not configured correctly. Run `iotedgedev solution create` to create a new solution with sample .env file. "
+                msg = "Environment variables not configured correctly. Run `iotedgedev new` to create a new solution with sample .env file. "
                 "Please see README for variable configuration options. Tip: You might just need to restart your command prompt to refresh your Environment Variables. "
                 "Variable that caused exception: {0}".format(str(ex))
                 raise ValueError(msg)

diff --git a/tests/test_envvars.py b/tests/test_envvars.py
index 038da27..49be0f3 100644
--- a/tests/test_envvars.py
+++ b/tests/test_envvars.py
@@ -75,49 +75,49 @@ def test_envvar_clean():
 def test_in_command_list_true_1():
     output = Output()
     envvars = EnvVars(output)
-    assert envvars.in_command_list("solution create test_solution", ["init", "e2e", "solution create", "create", "simulator stop"])
+    assert envvars.in_command_list("solution new test_solution", ["init", "e2e", "solution new", "new", "simulator stop"])
 
 
 def test_in_command_list_true_2():
     output = Output()
     envvars = EnvVars(output)
-    assert envvars.in_command_list("solution create", ["init", "e2e", "solution create", "create", "simulator stop"])
+    assert envvars.in_command_list("solution new", ["init", "e2e", "solution new", "new", "simulator stop"])
 
 
 def test_in_command_list_false_1():
     output = Output()
     envvars = EnvVars(output)
-    assert not envvars.in_command_list("solution add filtermodule", ["init", "e2e", "solution create", "create", "simulator stop"])
+    assert not envvars.in_command_list("solution add filtermodule", ["init", "e2e", "solution new", "new", "simulator stop"])
 
 
 def test_in_command_list_false_2():
     output = Output()
     envvars = EnvVars(output)
-    assert not envvars.in_command_list("solution addotherstuff filtermodule", ["init", "e2e", "solution add", "create", "simulator stop"])
+    assert not envvars.in_command_list("solution addotherstuff filtermodule", ["init", "e2e", "solution add", "new", "simulator stop"])
 
 
 def test_in_command_list_empty_1():
     output = Output()
     envvars = EnvVars(output)
-    assert not envvars.in_command_list("", ["init", "e2e", "solution create", "create", "simulator stop"])
+    assert not envvars.in_command_list("", ["init", "e2e", "solution new", "new", "simulator stop"])
 
 
 def test_in_command_list_empty_2():
     output = Output()
     envvars = EnvVars(output)
-    assert not envvars.in_command_list("solution create test_solution", ["init", "e2e", "", "create", "simulator stop"])
+    assert not envvars.in_command_list("solution new test_solution", ["init", "e2e", "", "new", "simulator stop"])
 
 
 def test_in_command_list_empty_3():
     output = Output()
     envvars = EnvVars(output)
-    assert envvars.in_command_list("", ["init", "e2e", "", "create", "simulator stop"])
+    assert envvars.in_command_list("", ["init", "e2e", "", "new", "simulator stop"])
 
 
 def test_is_bypass_command_true():
     output = Output()
     envvars = EnvVars(output)
-    assert envvars.is_bypass_command("solution create EdgeSolution")
+    assert envvars.is_bypass_command("solution new EdgeSolution")
 
 
 def test_is_bypass_command_false():
@@ -141,7 +141,7 @@ def test_is_terse_command_true():
 def test_is_terse_command_false():
     output = Output()
     envvars = EnvVars(output)
-    assert not envvars.is_terse_command("solution create")
+    assert not envvars.is_terse_command("solution new")
 
 
 def test_is_terse_command_empty():
diff --git a/tests/test_iotedgedev.py b/tests/test_iotedgedev.py
index c436ca8..60d7f06 100644
--- a/tests/test_iotedgedev.py
+++ b/tests/test_iotedgedev.py
@@ -36,7 +36,7 @@ def create_solution(request):
 
     runner = CliRunner()
     os.chdir(tests_dir)
-    result = runner.invoke(cli.main, ['solution', 'create', test_solution])
+    result = runner.invoke(cli.main, ['solution', 'new', test_solution])
     print(result.output)
     assert 'AZURE IOT EDGE SOLUTION CREATED' in result.output
 
@@ -58,7 +58,7 @@ def test_solution_create_in_non_empty_current_path(request):
 
     cli = __import__("iotedgedev.cli", fromlist=['main'])
     runner = CliRunner()
-    result = runner.invoke(cli.main, ['solution', 'create', '.'])
+    result = runner.invoke(cli.main, ['solution', 'new', '.'])
     print(result.output)
 
     assert "Directory is not empty" in result.output
@@ -75,7 +75,7 @@ def test_solution_create_in_empty_current_path(request):
 
     cli = __import__("iotedgedev.cli", fromlist=['main'])
     runner = CliRunner()
-    result = runner.invoke(cli.main, ['solution', 'create', '.'])
+    result = runner.invoke(cli.main, ['solution', 'new', '.'])
     print(result.output)
 
     assert 'AZURE IOT EDGE SOLUTION CREATED' in result.output
@@ -88,7 +88,7 @@ def test_solution_create_in_non_empty_dir(request):
 
     cli = __import__("iotedgedev.cli", fromlist=['main'])
     runner = CliRunner()
-    result = runner.invoke(cli.main, ['solution', 'create', test_solution])
+    result = runner.invoke(cli.main, ['solution', 'new', test_solution])
     print(result.output)
 
     assert "Directory is not empty" in result.output
@@ -104,7 +104,7 @@ def test_solution_create_in_empty_child_dir(request):
 
     cli = __import__("iotedgedev.cli", fromlist=['main'])
     runner = CliRunner()
-    result = runner.invoke(cli.main, ['solution', 'create', dirname])
+    result = runner.invoke(cli.main, ['solution', 'new', dirname])
     print(result.output)
 
     assert 'AZURE IOT EDGE SOLUTION CREATED' in result.output
diff --git a/tests/test_simulator.py b/tests/test_simulator.py
index 5ba1e56..38849d6 100644
--- a/tests/test_simulator.py
+++ b/tests/test_simulator.py
@@ -26,7 +26,7 @@ def create_solution(request):
 
     runner = CliRunner()
     os.chdir(tests_dir)
-    result = runner.invoke(cli.main, ['solution', 'create', test_solution])
+    result = runner.invoke(cli.main, ['solution', 'new', test_solution])
     print(result.output)
 
     assert 'AZURE IOT EDGE SOLUTION CREATED' in result.output

Renaming `iotedgedev create` to `iotedgedev new`
I am thinking about renaming the command `iotedgedev create` to `iotedgedev new` for the sake of simplicity and aligning with common practices (as how the command to create new projects is called in VS and VS Code). @jongio, do you think this is a good idea?
tests/test_envvars.py::test_is_bypass_command_true
tests/test_envvars.py::test_valid_get_envvar tests/test_envvars.py::test_invalid_get_envvar tests/test_envvars.py::test_valid_load tests/test_envvars.py::test_valid_verify_envvar_has_val tests/test_envvars.py::test_valid_get_envvar_key_if_val tests/test_envvars.py::test_invalid_get_envvar_key_if_val tests/test_envvars.py::test_set_envvar tests/test_envvars.py::test_envvar_clean tests/test_envvars.py::test_in_command_list_true_1 tests/test_envvars.py::test_in_command_list_true_2 tests/test_envvars.py::test_in_command_list_false_1 tests/test_envvars.py::test_in_command_list_false_2 tests/test_envvars.py::test_in_command_list_empty_1 tests/test_envvars.py::test_in_command_list_empty_2 tests/test_envvars.py::test_in_command_list_empty_3 tests/test_envvars.py::test_is_bypass_command_false tests/test_envvars.py::test_is_bypass_command_empty tests/test_envvars.py::test_is_terse_command_true tests/test_envvars.py::test_is_terse_command_false tests/test_envvars.py::test_is_terse_command_empty tests/test_envvars.py::test_default_container_registry_server_value_exists tests/test_envvars.py::test_default_container_registry_username_value_exists_or_returns_empty_string tests/test_envvars.py::test_default_container_registry_password_value_exists_or_returns_empty_string tests/test_envvars.py::test_container_registry_server_key_missing_sys_exit tests/test_envvars.py::test_container_registry_server_value_missing_sys_exit tests/test_envvars.py::test_unique_container_registry_server_tokens tests/test_envvars.py::test_unique_container_registry_username_tokens tests/test_envvars.py::test_unique_container_registry_password_tokens tests/test_envvars.py::test_additional_container_registry_server_has_val tests/test_envvars.py::test_additional_container_registry_username_has_val tests/test_envvars.py::test_additional_container_registry_password_has_val