diff --git a/.vs/ModernKeePass/v14/.suo b/.vs/ModernKeePass/v14/.suo
index 21d3a31..06373ad 100644
Binary files a/.vs/ModernKeePass/v14/.suo and b/.vs/ModernKeePass/v14/.suo differ
diff --git a/ModernKeePassLib/KeePassLib.2.19.0.26321.nupkg b/ModernKeePassLib/KeePassLib.2.19.0.26321.nupkg
deleted file mode 100644
index 197666a..0000000
Binary files a/ModernKeePassLib/KeePassLib.2.19.0.26321.nupkg and /dev/null differ
diff --git a/ModernKeePassLib/ModernKeePassLib.csproj b/ModernKeePassLib/ModernKeePassLib.csproj
index 4cc6775..245cdbe 100644
--- a/ModernKeePassLib/ModernKeePassLib.csproj
+++ b/ModernKeePassLib/ModernKeePassLib.csproj
@@ -32,14 +32,14 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE, KeePassWinRT</DefineConstants>
+    <DefineConstants>TRACE;NETSTANDARD1_2, KeePassWinRT</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NETSTANDARD1_2, KeePassWinRT</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>ARM</PlatformTarget>
@@ -49,7 +49,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
     <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;NETSTANDARD1_2, KeePassWinRT</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -61,7 +61,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NETSTANDARD1_2, KeePassWinRT</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
@@ -71,7 +71,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;NETSTANDARD1_2, KeePassWinRT</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -83,7 +83,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NETSTANDARD1_2, KeePassWinRT</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -93,7 +93,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;NETSTANDARD1_2, KeePassWinRT</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
diff --git a/ModernKeePassLib/ModernKeePassLib.nuspec b/ModernKeePassLib/ModernKeePassLib.nuspec
index d6545a3..43ae40d 100644
--- a/ModernKeePassLib/ModernKeePassLib.nuspec
+++ b/ModernKeePassLib/ModernKeePassLib.nuspec
@@ -1,17 +1,32 @@
 <?xml version="1.0"?>
 <package >
   <metadata>
-    <id>$id$</id>
-    <version>$version$</version>
-    <title>$title$</title>
-    <authors>$author$</authors>
-    <owners>$author$</owners>
+    <id>ModernKeePassLib</id>
+    <version>2.19.2900</version>
+    <title>ModernKeePassLib</title>
+    <authors>Geoffroy Bonneville</authors>
+    <owners>Geoffroy Bonneville</owners>
     <licenseUrl>https://www.gnu.org/licenses/gpl-3.0.en.html</licenseUrl>
     <projectUrl>https://github.com/wismna/ModernKeePass</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
+    <description>Portable KeePass Password Management Library</description>
     <releaseNotes>Initial release.</releaseNotes>
-    <copyright>$copyright$</copyright>
+    <copyright>Copyright © 2017 Geoffroy Bonneville</copyright>
     <tags>KeePass KeePassLib NetStandard</tags>
+    <dependencies>
+      <group targetFramework=".NETStandard1.2">
+        <dependency id="Microsoft.NETCore.Portable.Compatibility" version="1.0.2" exclude="Build,Analyzers" />
+        <dependency id="NETStandard.Library" version="2.0.0" exclude="Build,Analyzers" />
+        <dependency id="System.Net.Requests" version="4.3.0" exclude="Build,Analyzers" />
+        <dependency id="System.Runtime.WindowsRuntime" version="4.3.0" exclude="Build,Analyzers" />
+        <dependency id="System.Xml.XmlSerializer" version="4.3.0" exclude="Build,Analyzers" />
+      </group>
+    </dependencies>
   </metadata>
+  <files>
+    <!-- DLLs and resources -->
+    <file src="bin\ARM\Release\ModernKeePassLib.dll" target="lib\ARM\netstandard1.2"/>
+    <file src="bin\x64\Release\ModernKeePassLib.dll" target="lib\x64\netstandard1.2"/>
+    <file src="bin\x86\Release\ModernKeePassLib.dll" target="lib\x86\netstandard1.2"/>
+  </files>
 </package>
\ No newline at end of file
diff --git a/ModernKeePassLib/bin/Debug/ModernKeePassLib.dll b/ModernKeePassLib/bin/Debug/ModernKeePassLib.dll
deleted file mode 100644
index fbc73b2..0000000
Binary files a/ModernKeePassLib/bin/Debug/ModernKeePassLib.dll and /dev/null differ
diff --git a/ModernKeePassLib/bin/Debug/ModernKeePassLib.pdb b/ModernKeePassLib/bin/Debug/ModernKeePassLib.pdb
deleted file mode 100644
index 24040fe..0000000
Binary files a/ModernKeePassLib/bin/Debug/ModernKeePassLib.pdb and /dev/null differ
diff --git a/ModernKeePassLib/bin/Debug/Windows.winmd b/ModernKeePassLib/bin/Debug/Windows.winmd
deleted file mode 100644
index aeb07b5..0000000
Binary files a/ModernKeePassLib/bin/Debug/Windows.winmd and /dev/null differ
diff --git a/ModernKeePassLib/project.lock.json b/ModernKeePassLib/project.lock.json
index e9f5229..014b97f 100644
--- a/ModernKeePassLib/project.lock.json
+++ b/ModernKeePassLib/project.lock.json
@@ -111,6 +111,9 @@
           "lib/netstandard1.0/_._": {}
         }
       },
+      "NuSpec.ReferenceGenerator/1.4.2": {
+        "type": "package"
+      },
       "runtime.native.System/4.3.0": {
         "type": "package",
         "dependencies": {
@@ -775,6 +778,19 @@
         "lib/netstandard1.0/_._"
       ]
     },
+    "NuSpec.ReferenceGenerator/1.4.2": {
+      "sha512": "0AA2wcMaE84hDxzQOdRi2K2SGgEnJQ4LG6MyTrPvyjjyzeOT1hpUJk/w9NX5QAJy1T5eE7r3wPLq1rALr5oPaQ==",
+      "type": "package",
+      "files": [
+        "NuSpec.ReferenceGenerator.1.4.2.nupkg.sha512",
+        "NuSpec.ReferenceGenerator.nuspec",
+        "build/dotnet/NuSpec.ReferenceGenerator.targets",
+        "build/portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10/NuSpec.ReferenceGenerator.targets",
+        "tools/RefGen.exe",
+        "tools/RefGen.exe.config",
+        "tools/RefGen.pdb"
+      ]
+    },
     "runtime.native.System/4.3.0": {
       "sha512": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==",
       "type": "package",
@@ -2986,6 +3002,7 @@
     "": [
       "Microsoft.NETCore.Portable.Compatibility >= 1.0.2",
       "NETStandard.Library >= 2.0.0",
+      "NuSpec.ReferenceGenerator >= 1.4.2",
       "System.Net.Requests >= 4.3.0",
       "System.Runtime.WindowsRuntime >= 4.3.0",
       "System.Xml.XmlSerializer >= 4.3.0"