diff --git a/Tools/Nuget/NmeaParser/NmeaParser.nuspec b/Tools/Nuget/NmeaParser/NmeaParser.nuspec
index dcf4ab7..3f8c254 100644
--- a/Tools/Nuget/NmeaParser/NmeaParser.nuspec
+++ b/Tools/Nuget/NmeaParser/NmeaParser.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
-    <version>1.5.1</version>
+    <version>1.6.0</version>
     <authors>Morten Nielsen</authors>
     <owners>Morten Nielsen</owners>
     <licenseUrl>http://opensource.org/licenses/ms-pl.html</licenseUrl>
@@ -11,16 +11,8 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>An NMEA stream parser for serial port, bluetooth and file-based nmea simulation.</description>
     <language>en-US</language>
-    <tags>nmea winrt wpf win8 win8.1 wp8.1 gps serialport bluetooth</tags>
+    <tags>nmea winrt wpf win8 win8.1 wp8.1 uwp xamarin gps serialport bluetooth</tags>
 	<releaseNotes>
 	</releaseNotes>
   </metadata>
-  <files>
-    <file src="lib\netcore45\NmeaParser.WinStore.dll"      target="lib\netcore45\NmeaParser.WinStore.dll" />
-	<file src="lib\netcore45\NmeaParser.WinStore.xml"      target="lib\netcore45\NmeaParser.WinStore.xml" />
-    <file src="lib\wpa\NmeaParser.WinPhone.dll"            target="lib\wpa\NmeaParser.WinPhone.dll" />
-    <file src="lib\wpa\NmeaParser.WinPhone.xml"            target="lib\wpa\NmeaParser.WinPhone.xml" />
-    <file src="lib\net40-client\NmeaParser.WinDesktop.dll" target="lib\net40-client\NmeaParser.WinDesktop.dll" />
-    <file src="lib\net40-client\NmeaParser.WinDesktop.xml" target="lib\net40-client\NmeaParser.WinDesktop.xml" />
-  </files>
 </package>
diff --git a/Tools/Nuget/NuGet.exe b/Tools/Nuget/NuGet.exe
index c41a0d0..9f8781d 100644
Binary files a/Tools/Nuget/NuGet.exe and b/Tools/Nuget/NuGet.exe differ
diff --git a/Tools/Nuget/buildNuget.cmd b/Tools/Nuget/buildNuget.cmd
index 8ed9cad..7305cea 100644
--- a/Tools/Nuget/buildNuget.cmd
+++ b/Tools/Nuget/buildNuget.cmd
@@ -7,12 +7,21 @@ REM msbuild ..\..\src\NmeaParser.sln /t:Rebuild /p:Configuration=Release
 msbuild ..\..\src\NmeaParser.WinDesktop\NmeaParser.WinDesktop.csproj /t:Rebuild /p:Configuration=Release
 msbuild ..\..\src\NmeaParser.WinStore\NmeaParser.WinStore.csproj /t:Rebuild /p:Configuration=Release
 msbuild ..\..\src\NmeaParser.WinPhone\NmeaParser.WinPhone.csproj /t:Rebuild /p:Configuration=Release
+msbuild ..\..\src\NmeaParser.UWP\NmeaParser.UWP.csproj /t:Rebuild /p:Configuration=Release
+msbuild ..\..\src\NmeaParser.Android\NmeaParser.Android.csproj /t:Rebuild /p:Configuration=Release
+msbuild ..\..\src\NmeaParser.iOS\NmeaParser.iOS.csproj /t:Rebuild /p:Configuration=Release
 xcopy ..\..\src\bin\Release\NmeaParser.WinStore.dll .\NmeaParser\lib\netcore45\ /Y
 xcopy ..\..\src\bin\Release\NmeaParser.WinStore.xml .\NmeaParser\lib\netcore45\ /Y
 xcopy ..\..\src\bin\Release\NmeaParser.WinPhone.dll .\NmeaParser\lib\wpa\ /Y
 xcopy ..\..\src\bin\Release\NmeaParser.WinPhone.xml .\NmeaParser\lib\wpa\ /Y
 xcopy ..\..\src\bin\Release\NmeaParser.WinDesktop.dll .\NmeaParser\lib\net40-client\ /Y
 xcopy ..\..\src\bin\Release\NmeaParser.WinDesktop.xml .\NmeaParser\lib\net40-client\ /Y
+xcopy ..\..\src\bin\Release\NmeaParser.UWP.dll .\NmeaParser\lib\uap10.0\ /Y
+xcopy ..\..\src\bin\Release\NmeaParser.UWP.xml .\NmeaParser\lib\uap10.0\ /Y
+xcopy ..\..\src\bin\Release\NmeaParser.Android.dll .\NmeaParser\lib\MonoAndroid10\ /Y
+xcopy ..\..\src\bin\Release\NmeaParser.Android.xml .\NmeaParser\lib\MonoAndroid10\ /Y
+xcopy ..\..\src\bin\Release\NmeaParser.iOS.dll .\NmeaParser\lib\Xamarin.iOS10\ /Y
+xcopy ..\..\src\bin\Release\NmeaParser.iOS.xml .\NmeaParser\lib\Xamarin.iOS10\ /Y
 
 
 @echo *******************************************
diff --git a/src/NmeaParser.Android/NmeaParser.Android.csproj b/src/NmeaParser.Android/NmeaParser.Android.csproj
index 2c3f394..777515f 100644
--- a/src/NmeaParser.Android/NmeaParser.Android.csproj
+++ b/src/NmeaParser.Android/NmeaParser.Android.csproj
@@ -16,6 +16,7 @@
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
     <DevInstrumentationEnabled>True</DevInstrumentationEnabled>
+    <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/NmeaParser.Shared/Properties/AssemblyInfo.cs b/src/NmeaParser.Shared/Properties/AssemblyInfo.cs
index 431438e..36fd8a5 100644
--- a/src/NmeaParser.Shared/Properties/AssemblyInfo.cs
+++ b/src/NmeaParser.Shared/Properties/AssemblyInfo.cs
@@ -24,6 +24,6 @@ using System.Runtime.InteropServices;
 // 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.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/src/NmeaParser.iOS/NmeaParser.iOS.csproj b/src/NmeaParser.iOS/NmeaParser.iOS.csproj
index 89a4a98..0d00653 100644
--- a/src/NmeaParser.iOS/NmeaParser.iOS.csproj
+++ b/src/NmeaParser.iOS/NmeaParser.iOS.csproj
@@ -10,7 +10,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>NmeaParser.iOS</RootNamespace>
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
-    <AssemblyName>NmeaParseriOS</AssemblyName>
+    <AssemblyName>NmeaParser.iOS</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -23,7 +23,7 @@
     <ConsolePause>false</ConsolePause>
     <MtouchDebug>true</MtouchDebug>
     <CodesignKey>iPhone Developer</CodesignKey>
-    <DocumentationFile>..\Bin\Debug\NmeaParseriOS.xml</DocumentationFile>
+    <DocumentationFile>..\Bin\Debug\NmeaParser.iOS.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
@@ -33,7 +33,7 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <CodesignKey>iPhone Developer</CodesignKey>
-    <DocumentationFile>..\Bin\Release\NmeaParseriOS.xml</DocumentationFile>
+    <DocumentationFile>..\Bin\Release\NmeaParser.iOS.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
     <Folder Include="Properties\" />