diff --git a/Output/Setup_RevitPythonShell_2018.exe b/Output/Setup_RevitPythonShell_2018.exe
new file mode 100644
index 0000000..48dc059
Binary files /dev/null and b/Output/Setup_RevitPythonShell_2018.exe differ
diff --git a/PythonConsoleControl/PythonConsoleControl.csproj b/PythonConsoleControl/PythonConsoleControl.csproj
index 02febd5..0ed8b4b 100644
--- a/PythonConsoleControl/PythonConsoleControl.csproj
+++ b/PythonConsoleControl/PythonConsoleControl.csproj
@@ -40,6 +40,9 @@
   <PropertyGroup Condition="'$(Configuration)' == 'Debug 2017'">
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug 2018'">
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -89,6 +92,16 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug 2018|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug 2018\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="ICSharpCode.AvalonEdit, Version=5.0.3.0, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
       <HintPath>..\packages\AvalonEdit.5.0.3\lib\Net40\ICSharpCode.AvalonEdit.dll</HintPath>
diff --git a/RequiredLibraries/Revit2018/RevitAPI.dll b/RequiredLibraries/Revit2018/RevitAPI.dll
new file mode 100644
index 0000000..13c6b17
Binary files /dev/null and b/RequiredLibraries/Revit2018/RevitAPI.dll differ
diff --git a/RequiredLibraries/Revit2018/RevitAPIUI.dll b/RequiredLibraries/Revit2018/RevitAPIUI.dll
new file mode 100644
index 0000000..8bd4e93
Binary files /dev/null and b/RequiredLibraries/Revit2018/RevitAPIUI.dll differ
diff --git a/RevitPythonShell.sln b/RevitPythonShell.sln
index 4156e46..bb7c5d3 100644
--- a/RevitPythonShell.sln
+++ b/RevitPythonShell.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26228.9
+VisualStudioVersion = 15.0.26228.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RevitPythonShell", "RevitPythonShell\RevitPythonShell.csproj", "{7E37F14E-D840-42F8-8CA6-90FFC5497972}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -26,6 +26,7 @@ Global
 		Debug 2015|Any CPU = Debug 2015|Any CPU
 		Debug 2016|Any CPU = Debug 2016|Any CPU
 		Debug 2017|Any CPU = Debug 2017|Any CPU
+		Debug 2018|Any CPU = Debug 2018|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{7E37F14E-D840-42F8-8CA6-90FFC5497972}.Debug 2014|Any CPU.ActiveCfg = Debug 2014|Any CPU
@@ -36,6 +37,8 @@ Global
 		{7E37F14E-D840-42F8-8CA6-90FFC5497972}.Debug 2016|Any CPU.Build.0 = Debug 2016|Any CPU
 		{7E37F14E-D840-42F8-8CA6-90FFC5497972}.Debug 2017|Any CPU.ActiveCfg = Debug 2017|Any CPU
 		{7E37F14E-D840-42F8-8CA6-90FFC5497972}.Debug 2017|Any CPU.Build.0 = Debug 2017|Any CPU
+		{7E37F14E-D840-42F8-8CA6-90FFC5497972}.Debug 2018|Any CPU.ActiveCfg = Debug 2018|Any CPU
+		{7E37F14E-D840-42F8-8CA6-90FFC5497972}.Debug 2018|Any CPU.Build.0 = Debug 2018|Any CPU
 		{F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Debug 2014|Any CPU.ActiveCfg = Debug|Any CPU
 		{F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Debug 2014|Any CPU.Build.0 = Debug|Any CPU
 		{F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Debug 2015|Any CPU.ActiveCfg = Debug 2015|Any CPU
@@ -44,6 +47,8 @@ Global
 		{F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Debug 2016|Any CPU.Build.0 = Debug 2016|Any CPU
 		{F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Debug 2017|Any CPU.ActiveCfg = Debug 2017|Any CPU
 		{F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Debug 2017|Any CPU.Build.0 = Debug 2017|Any CPU
+		{F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Debug 2018|Any CPU.ActiveCfg = Debug 2018|Any CPU
+		{F1152D68-346B-4F48-8DB7-BE67B5CB1F49}.Debug 2018|Any CPU.Build.0 = Debug 2018|Any CPU
 		{C8446636-C663-409F-82D0-72C0D55BBA1C}.Debug 2014|Any CPU.ActiveCfg = Debug 2014|Any CPU
 		{C8446636-C663-409F-82D0-72C0D55BBA1C}.Debug 2014|Any CPU.Build.0 = Debug 2014|Any CPU
 		{C8446636-C663-409F-82D0-72C0D55BBA1C}.Debug 2015|Any CPU.ActiveCfg = Debug 2015|Any CPU
@@ -52,6 +57,8 @@ Global
 		{C8446636-C663-409F-82D0-72C0D55BBA1C}.Debug 2016|Any CPU.Build.0 = Debug 2016|Any CPU
 		{C8446636-C663-409F-82D0-72C0D55BBA1C}.Debug 2017|Any CPU.ActiveCfg = Debug 2017|Any CPU
 		{C8446636-C663-409F-82D0-72C0D55BBA1C}.Debug 2017|Any CPU.Build.0 = Debug 2017|Any CPU
+		{C8446636-C663-409F-82D0-72C0D55BBA1C}.Debug 2018|Any CPU.ActiveCfg = Debug 2018|Any CPU
+		{C8446636-C663-409F-82D0-72C0D55BBA1C}.Debug 2018|Any CPU.Build.0 = Debug 2018|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/RevitPythonShell/RevitPythonShell.csproj b/RevitPythonShell/RevitPythonShell.csproj
index fd133a3..1b23fd7 100644
--- a/RevitPythonShell/RevitPythonShell.csproj
+++ b/RevitPythonShell/RevitPythonShell.csproj
@@ -52,6 +52,9 @@
   <PropertyGroup Condition="'$(Configuration)' == 'Debug 2017'">
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug 2018'">
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -111,6 +114,16 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug 2018|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug 2018\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup Condition="'$(Configuration)' == 'Debug 2014'">
     <Reference Include="RevitAPI">
       <HintPath>..\RequiredLibraries\Revit2014\RevitAPI.dll</HintPath>
@@ -143,6 +156,14 @@
       <HintPath>..\RequiredLibraries\Revit2017\RevitAPIUI.dll</HintPath>
     </Reference>
   </ItemGroup>
+  <ItemGroup Condition="'$(Configuration)' == 'Debug 2018'">
+    <Reference Include="RevitAPI">
+      <HintPath>..\RequiredLibraries\Revit2018\RevitAPI.dll</HintPath>
+    </Reference>
+    <Reference Include="RevitAPIUI">
+      <HintPath>..\RequiredLibraries\Revit2018\RevitAPIUI.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <ItemGroup>
     <Reference Include="ICSharpCode.AvalonEdit, Version=5.0.3.0, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
       <HintPath>..\packages\AvalonEdit.5.0.3\lib\Net40\ICSharpCode.AvalonEdit.dll</HintPath>
@@ -172,9 +193,15 @@
     <Reference Include="PythonConsoleControl">
       <HintPath>..\PythonConsoleControl\bin\Debug 2017\PythonConsoleControl.dll</HintPath>
     </Reference>
+    <Reference Include="PythonConsoleControl">
+      <HintPath>..\PythonConsoleControl\bin\Debug 2018\PythonConsoleControl.dll</HintPath>
+    </Reference>
     <Reference Include="RpsRuntime">
       <HintPath>..\RpsRuntime\bin\Debug 2017\RpsRuntime.dll</HintPath>
     </Reference>
+    <Reference Include="RpsRuntime">
+      <HintPath>..\RpsRuntime\bin\Debug 2018\RpsRuntime.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
diff --git a/RpsRuntime/RpsRuntime.csproj b/RpsRuntime/RpsRuntime.csproj
index 403a49b..12a6109 100644
--- a/RpsRuntime/RpsRuntime.csproj
+++ b/RpsRuntime/RpsRuntime.csproj
@@ -29,6 +29,9 @@
   <PropertyGroup Condition="'$(Configuration)' == 'Debug 2017'">
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug 2018'">
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug 2014|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug 2014\</OutputPath>
@@ -69,6 +72,16 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug 2018|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug 2018\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup Condition="'$(Configuration)' == 'Debug 2014'">
     <Reference Include="RevitAPI">
       <HintPath>..\RequiredLibraries\Revit2014\RevitAPI.dll</HintPath>
@@ -101,6 +114,14 @@
       <HintPath>..\RequiredLibraries\Revit2017\RevitAPIUI.dll</HintPath>
     </Reference>
   </ItemGroup>
+  <ItemGroup Condition="'$(Configuration)' == 'Debug 2018'">
+    <Reference Include="RevitAPI">
+      <HintPath>..\RequiredLibraries\Revit2018\RevitAPI.dll</HintPath>
+    </Reference>
+    <Reference Include="RevitAPIUI">
+      <HintPath>..\RequiredLibraries\Revit2018\RevitAPIUI.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <ItemGroup>
     <Reference Include="ICSharpCode.AvalonEdit, Version=5.0.3.0, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
       <HintPath>..\packages\AvalonEdit.5.0.3\lib\Net40\ICSharpCode.AvalonEdit.dll</HintPath>
diff --git a/Setup_RevitPythonShell_2018.iss b/Setup_RevitPythonShell_2018.iss
new file mode 100644
index 0000000..036708b
--- /dev/null
+++ b/Setup_RevitPythonShell_2018.iss
@@ -0,0 +1,59 @@
+[Files]
+Source: "RevitPythonShell\bin\Debug 2018\PythonConsoleControl.dll"; DestDir: "{app}"; Flags: replacesameversion
+Source: "RevitPythonShell\bin\Debug 2018\RevitPythonShell.dll"; DestDir: "{app}"; Flags: replacesameversion
+Source: "RevitPythonShell\bin\Debug 2018\RpsRuntime.dll"; DestDir: "{app}"; Flags: replacesameversion
+Source: "packages\AvalonEdit.5.0.3\lib\Net40\ICSharpCode.AvalonEdit.dll"; DestDir: "{app}"
+Source: "RequiredLibraries\IronPython.dll"; DestDir: "{app}"
+Source: "RequiredLibraries\IronPython.Modules.dll"; DestDir: "{app}"
+Source: "RequiredLibraries\Microsoft.Scripting.Metadata.dll"; DestDir: "{app}"
+Source: "RequiredLibraries\Microsoft.Dynamic.dll"; DestDir: "{app}"
+Source: "RequiredLibraries\Microsoft.Scripting.dll"; DestDir: "{app}"
+Source: "RevitPythonShell\RevitPythonShell.xml"; DestDir: "{userappdata}\RevitPythonShell2018"; Flags: onlyifdoesntexist
+Source: RevitPythonShell\init.py; DestDir: {userappdata}\RevitPythonShell2018; Flags: confirmoverwrite; 
+Source: RevitPythonShell\startup.py; DestDir: {userappdata}\RevitPythonShell2018; Flags: confirmoverwrite; 
+
+[code]
+{ HANDLE INSTALL PROCESS STEPS }
+procedure CurStepChanged(CurStep: TSetupStep);
+var
+  AddInFilePath: String;
+  AddInFileContents: String;
+begin
+
+  if CurStep = ssPostInstall then
+  begin
+
+	{ GET LOCATION OF USER AppData (Roaming) }
+	AddInFilePath := ExpandConstant('{userappdata}\Autodesk\Revit\Addins\2018\RevitPythonShell2018.addin');
+
+	{ CREATE NEW ADDIN FILE }
+	AddInFileContents := '<?xml version="1.0" encoding="utf-16" standalone="no"?>' + #13#10;
+	AddInFileContents := AddInFileContents + '<RevitAddIns>' + #13#10;
+	AddInFileContents := AddInFileContents + '  <AddIn Type="Application">' + #13#10;
+  AddInFileContents := AddInFileContents + '    <Name>RevitPythonShell</Name>' + #13#10;
+	AddInFileContents := AddInFileContents + '    <Assembly>'  + ExpandConstant('{app}') + '\RevitPythonShell.dll</Assembly>' + #13#10;
+	AddInFileContents := AddInFileContents + '    <AddInId>3a7a1d24-51ed-462b-949f-1ddcca12008d</AddInId>' + #13#10;
+	AddInFileContents := AddInFileContents + '    <FullClassName>RevitPythonShell.RevitPythonShellApplication</FullClassName>' + #13#10;
+	AddInFileContents := AddInFileContents + '  <VendorId>RIPS</VendorId>' + #13#10;
+	AddInFileContents := AddInFileContents + '  </AddIn>' + #13#10;
+	AddInFileContents := AddInFileContents + '</RevitAddIns>' + #13#10;
+	SaveStringToFile(AddInFilePath, AddInFileContents, False);
+
+  end;
+end;
+
+
+[Setup]
+AppName=RevitPythonShell for Autodesk Revit 2018
+AppVerName=RevitPythonShell for Autodesk Revit 2018
+RestartIfNeededByRun=false
+DefaultDirName={pf32}\RevitPythonShell2018
+OutputBaseFilename=Setup_RevitPythonShell_2018
+ShowLanguageDialog=auto
+FlatComponentsList=false
+UninstallFilesDir={app}\Uninstall
+UninstallDisplayName=RevitPythonShell for Autodesk Revit 2018
+AppVersion=2018.0
+VersionInfoVersion=2018.0
+VersionInfoDescription=RevitPythonShell for Autodesk Revit 2018
+VersionInfoTextVersion=RevitPythonShell for Autodesk Revit 2018