diff --git a/CSGSI.sln b/CSGSI.sln
index 511abca..428e000 100644
--- a/CSGSI.sln
+++ b/CSGSI.sln
@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.16
+VisualStudioVersion = 15.0.26730.15
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSGSI", "CSGSI\CSGSI.csproj", "{8D55804C-2CF1-4A65-9C3E-8E41CD809535}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSGSI", "CSGSI\CSGSI.csproj", "{74431D18-39FE-4F05-AC75-726BC97C2A1A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,12 +11,15 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8D55804C-2CF1-4A65-9C3E-8E41CD809535}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8D55804C-2CF1-4A65-9C3E-8E41CD809535}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D55804C-2CF1-4A65-9C3E-8E41CD809535}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8D55804C-2CF1-4A65-9C3E-8E41CD809535}.Release|Any CPU.Build.0 = Release|Any CPU
+		{74431D18-39FE-4F05-AC75-726BC97C2A1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{74431D18-39FE-4F05-AC75-726BC97C2A1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{74431D18-39FE-4F05-AC75-726BC97C2A1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{74431D18-39FE-4F05-AC75-726BC97C2A1A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {7D6513B3-7D8A-4F8F-8439-D75C4A6FC4B1}
+	EndGlobalSection
 EndGlobal
diff --git a/CSGSI/CSGSI.csproj b/CSGSI/CSGSI.csproj
index 0221c87..9648dd7 100644
--- a/CSGSI/CSGSI.csproj
+++ b/CSGSI/CSGSI.csproj
@@ -1,76 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{8D55804C-2CF1-4A65-9C3E-8E41CD809535}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>CSGSI</RootNamespace>
-    <AssemblyName>CSGSI</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
+    <TargetFrameworks>netstandard2.0;net451;net4;net461</TargetFrameworks>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\CSGSI.XML</DocumentationFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Events\CSGSIEventHandlers.cs" />
-    <Compile Include="GameState.cs" />
-    <Compile Include="GameStateListener.cs" />
-    <Compile Include="Nodes\AllPlayersNode.cs" />
-    <Compile Include="Nodes\AuthNode.cs" />
-    <Compile Include="Nodes\MapNode.cs" />
-    <Compile Include="Nodes\MatchStatsNode.cs" />
-    <Compile Include="Nodes\NodeBase.cs" />
-    <Compile Include="Nodes\PhaseCountdownsNode.cs" />
-    <Compile Include="Nodes\PlayerNode.cs" />
-    <Compile Include="Nodes\ProviderNode.cs" />
-    <Compile Include="Nodes\RoundNode.cs" />
-    <Compile Include="Nodes\PlayerStateNode.cs" />
-    <Compile Include="Nodes\MapTeamNode.cs" />
-    <Compile Include="Nodes\WeaponNode.cs" />
-    <Compile Include="Nodes\WeaponsNode.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+
+  
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+</ItemGroup>
+
+<ItemGroup Condition="'$(TargetFramework)' == 'net451'">
+     <PackageReference Include="Newtonsoft.Json" Version="7.0.1" />
+</ItemGroup>
+
+<ItemGroup Condition="'$(TargetFramework)' == 'net4'">
+     <PackageReference Include="Newtonsoft.Json" Version="7.0.1" />
+</ItemGroup>
+
+<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
+     <PackageReference Include="Newtonsoft.Json" Version="7.0.1" />
+</ItemGroup>
+
+</Project>
diff --git a/CSGSI/GameStateListener.cs b/CSGSI/GameStateListener.cs
index 83330c4..3096d8d 100644
--- a/CSGSI/GameStateListener.cs
+++ b/CSGSI/GameStateListener.cs
@@ -150,7 +150,7 @@ private void ReceiveGameState(IAsyncResult result)
             {
                 context = _listener.EndGetContext(result);
             }
-            catch (ObjectDisposedException e)
+            catch
             {
                 // Listener was Closed due to call of Stop();
                 return;
diff --git a/CSGSI/Properties/AssemblyInfo.cs b/CSGSI/Properties/AssemblyInfo.cs
deleted file mode 100644
index 6219c33..0000000
--- a/CSGSI/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("CSGSI")]
-[assembly: AssemblyDescription("A simple Game State Integration handler for CS:GO")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CSGSI")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("12de3576-5e68-4a3a-9355-faf4500e71bc")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/CSGSI/packages.config b/CSGSI/packages.config
deleted file mode 100644
index 505e588..0000000
--- a/CSGSI/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
-</packages>
\ No newline at end of file