diff --git a/EEIP.NET/EEIP.csproj b/EEIP.NET/EEIP.csproj
index 2903aa7..0f1e570 100644
--- a/EEIP.NET/EEIP.csproj
+++ b/EEIP.NET/EEIP.csproj
@@ -1,91 +1,40 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.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>{C7A980DD-A57F-4FC7-A555-10EDC85C749D}</ProjectGuid>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Sres.Networking.Eeip.Library</RootNamespace>
-    <AssemblyName>EEIP</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <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' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject />
   </PropertyGroup>
-  <ItemGroup>
-    <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.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CIP.cs" />
-    <Compile Include="EIPClient.cs" />
-    <Compile Include="Encapsulation.cs" />
-    <Compile Include="ObjectLibrary\TcpIpInterfaceObject.cs" />
-    <Compile Include="ObjectLibrary\AssemblyObject.cs" />
-    <Compile Include="ObjectLibrary\ConnectionManagerObject.cs" />
-    <Compile Include="ObjectLibrary\IdentityObject.cs" />
-    <Compile Include="ObjectLibrary\MessageRouterObject.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <None Include="LabView Example\Builds\LabView_EEIP.aliases" />
-    <None Include="LabView Example\Builds\LabView_EEIP.ini" />
-    <None Include="LabView Example\EEIP.vi" />
-    <None Include="LabView Example\EEIP_LabViewExample.aliases" />
-    <None Include="LabView Example\EEIP_LabViewExample.lvlps" />
+	<PropertyGroup>
+		<VersionPrefix>1.6.1</VersionPrefix>
+	</PropertyGroup>
+	<ItemGroup>
+    <None Include="..\LICENSE">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
     <None Include="LabView Example\EEIP_LabViewExample.lvproj" />
-    <None Include="Notes\Erstellen und Veröffentlichen eines .NET Framework-NuGet-Pakets mithilfe von Visual Studio auf Windows _ Microsoft Docs.pdf" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="LabView Example\Builds\data\EEIP.dll" />
     <Content Include="LabView Example\Builds\LabView_EEIP.exe" />
     <Content Include="LabView Example\EEIP.dll" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
+    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.3.310801">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+  <PropertyGroup />
   <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <PackageProjectUrl>http://eeip-library.de/</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/rossmann-engineering/EEIP.NET</RepositoryUrl>
   </PropertyGroup>
-  <!-- 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
diff --git a/EEIP.NET/EIPClient.cs b/EEIP.NET/EIPClient.cs
index cd8962c..b5be210 100644
--- a/EEIP.NET/EIPClient.cs
+++ b/EEIP.NET/EIPClient.cs
@@ -179,7 +179,7 @@ public class UdpState
             
             foreach (NetworkInterface ni in NetworkInterface.GetAllNetworkInterfaces())
             {
-                if (ni.NetworkInterfaceType == NetworkInterfaceType.Wireless80211 || ni.NetworkInterfaceType == NetworkInterfaceType.Ethernet)
+                if ((ni.NetworkInterfaceType == NetworkInterfaceType.Wireless80211 || ni.NetworkInterfaceType == NetworkInterfaceType.Ethernet) && ni.OperationalStatus == OperationalStatus.Up)
                 {
 
                     foreach (UnicastIPAddressInformation ip in ni.GetIPProperties().UnicastAddresses)
diff --git a/EEIP.NET/Properties/AssemblyInfo.cs b/EEIP.NET/Properties/AssemblyInfo.cs
index b09091d..ea077bb 100644
--- a/EEIP.NET/Properties/AssemblyInfo.cs
+++ b/EEIP.NET/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Stefan Rossmann Engineering Solutions")]
 [assembly: AssemblyProduct("EEIP.NET")]
-[assembly: AssemblyCopyright("Copyright ©  2018-2020")]
+[assembly: AssemblyCopyright("Copyright ©  2018-2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // 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.6.0.*")]
-[assembly: AssemblyFileVersion("1.6.0.*")]
+[assembly: AssemblyVersion("1.6.1")]
+[assembly: AssemblyFileVersion("1.6.1")]