@@ -9,6 +9,8 @@
  - Upd: Template PSFTests - Added localization string tests
  - Upd: Remove-PSMDTemplate - Refactored and updated messaging / ShouldProcess implementation
  - Upd: Find-PSMDFileContent - Updated extension filtering to be configurable and include .cs files by default.
+ - Upd: Get-PSMDArgumentCompleter - Refactoring and minor performance improvement
+ - Upd: Restart-PSMDShell - Will restart same application as current process, enabling it to restart on core versions
  - Fix: Template PSFProject - Publish Folder created during build is created using `-Force`
  - Fix: Template PSFProject - Cleaning up Azure Function conversion
  - Fix: Template PSFTests - Encoding test no longer fails on core (#104)
 
@@ -51,19 +51,26 @@
 		$NoProfile
 	)
 
-	if ($PSCmdlet.ShouldProcess("Current shell", "Restart"))
+	begin
 	{
-		if ($NoProfile)
-		{
-			if ($Admin) { Start-Process powershell.exe -Verb RunAs -ArgumentList '-NoProfile' }
-			else { Start-Process powershell.exe -ArgumentList '-NoProfile' }
-		}
-		else
+		$powershellPath = (Get-Process -id $pid).Path
+	}
+	process
+	{
+		if ($PSCmdlet.ShouldProcess("Current shell", "Restart"))
 		{
-			if ($Admin) { Start-Process powershell.exe -Verb RunAs }
-			else { Start-Process powershell.exe }
+			if ($NoProfile)
+			{
+				if ($Admin) { Start-Process $powershellPath -Verb RunAs -ArgumentList '-NoProfile' }
+				else { Start-Process $powershellPath -ArgumentList '-NoProfile' }
+			}
+			else
+			{
+				if ($Admin) { Start-Process $powershellPath -Verb RunAs }
+				else { Start-Process $powershellPath }
+			}
+			if (-not $NoExit) { exit }
 		}
-		if (-not $NoExit) { exit }
 	}
 }
 New-Alias -Name Restart-Shell -Value Restart-PSMDShell -Option AllScope -Scope Global