diff --git a/Developer Tools/Tweetinvi.Builder.ps1 b/Developer Tools/Tweetinvi.Builder.ps1
index db6531985..2024672f1 100644
--- a/Developer Tools/Tweetinvi.Builder.ps1	
+++ b/Developer Tools/Tweetinvi.Builder.ps1	
@@ -268,7 +268,7 @@ if (!$uv.IsPresent) {
 		
 		for ($i=0; $i -lt $projects.length; $i++)
 		{
-			$certPaths = $certPaths + $temporaryFolder + '\' + $projects[$i] + '.dll ';
+			$certPaths = $certPaths + $nugetToolsFolder + '\' + $projects[$i] + '.dll ';
 		}
 		
 
@@ -276,31 +276,12 @@ if (!$uv.IsPresent) {
 		Start-Process -Wait -FilePath $signToolExe -ArgumentList " sign ",$certPath,$certPassword,$certTimestamp,$certPaths -PassThru -NoNewWindow;
 	}
 
-	if ($nugetMultipleDLLs.IsPresent)
-	{
-        # Copy *.dll into nuget folders
-		Get-ChildItem -LiteralPath $examplinviBin -filter Tweetinvi*.dll  | % { Copy-Item $_.fullname $net40Folder }
-		Get-ChildItem -LiteralPath $examplinviBin -filter Tweetinvi*.dll  | % { Copy-Item $_.fullname $net45Folder }
-		Get-ChildItem -LiteralPath $examplinviBin -filter Tweetinvi*.dll  | % { Copy-Item $_.fullname $net40PortableFolder }
-		Get-ChildItem -LiteralPath $examplinviBin -filter Tweetinvi*.dll  | % { Copy-Item $_.fullname $net45PortableFolder }
-	}
-
-	
-	if (!$nugetMultipleDLLs.IsPresent) {
-        # Copy Merged DLL into Nuget folder
-
-		Write-Host 'Copying merged DLL into nuget...' 
-		Write-Host $mergedDLLPath;
-
-		$mergedDLLPath = '.\' + $mergedDLLPath;
-
-		Copy-Item $mergedDLLPath ($net40Folder + '\Tweetinvi.dll');
-		Copy-Item $mergedDLLPath ($net45Folder + '\Tweetinvi.dll');
-		Copy-Item $mergedDLLPath ($net40PortableFolder + '\Tweetinvi.dll');
-
-		Get-ChildItem -LiteralPath $temporaryFolder -filter Tweetinvi*.dll  | % { Copy-Item $_.fullname $net45PortableFolder }
-        Get-ChildItem -LiteralPath $netCoreTemp -filter Tweetinvi*.dll | % { Copy-Item $_.fullname $netCoreNugetFolder }
-	}
+	# Copy *.dll into nuget folders
+	Get-ChildItem -LiteralPath $netCoreTemp -filter Tweetinvi*.dll | % { Copy-Item $_.fullname $netCoreNugetFolder }
+	Get-ChildItem -LiteralPath $netCoreTemp -filter Tweetinvi*.dll | % { Copy-Item $_.fullname $net40Folder }
+	Get-ChildItem -LiteralPath $netCoreTemp -filter Tweetinvi*.dll | % { Copy-Item $_.fullname $net45Folder }
+	Get-ChildItem -LiteralPath $netCoreTemp -filter Tweetinvi*.dll | % { Copy-Item $_.fullname $net40PortableFolder }
+	Get-ChildItem -LiteralPath $netCoreTemp -filter Tweetinvi*.dll | % { Copy-Item $_.fullname $net45PortableFolder }
 
 	# Create Zip files
 	$tweetinviBinariesPackage = 'Tweetinvi ' + $version + ' - Binaries.zip'
diff --git a/Developer Tools/TweetinviAPI/TweetinviAPI.nuspec b/Developer Tools/TweetinviAPI/TweetinviAPI.nuspec
index 9453e704c..0dff5e5ea 100644
--- a/Developer Tools/TweetinviAPI/TweetinviAPI.nuspec	
+++ b/Developer Tools/TweetinviAPI/TweetinviAPI.nuspec	
@@ -10,10 +10,10 @@
     <projectUrl>https://github.com/linvi/tweetinvi</projectUrl>
     <iconUrl>https://raw.githubusercontent.com/linvi/tweetinvi/master/tweetinvi-logo-purple.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Tweetinvi is an intuitive .NET C# library to access the Twitter REST API. It is a Portable Class Library that can be used for development on Windows, Windows RT, Windows Phone, Mono, Xamarin Android and Xamarin iOS. Tweetinvi is also compatible for Universal App development and .NETCore.</description>
-    <summary>The best Twitter C# Library out there! Works with .NETCore and PCL.</summary>
+    <description>Tweetinvi is an intuitive .NET C# library to access the Twitter REST API. It is a .NET Core library that can be used for development on Windows, Windows RT, Windows Phone, Xamarin Android and Xamarin iOS. Tweetinvi is also compatible with Windows 10 Universal Apps.</description>
+    <summary>The best Twitter C# Library out there! Works with .NET Framework and .NETCore.</summary>
     <releaseNotes>https://github.com/linvi/tweetinvi/releases/tag/2.1.0.0</releaseNotes>
-    <copyright>Tweetinvi 2016</copyright>
+    <copyright>Tweetinvi 2017</copyright>
     <language>en-US</language>
     <tags>twitter c# rest stream api 1.1 .net netcore netstandard core</tags>
     <dependencies>