diff --git a/Gruntfile.js b/Gruntfile.js
index 9376906..9b4e6aa 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -13,33 +13,28 @@ module.exports = function (grunt) {
 
 	grunt.initConfig({
 	    pkg: pkg,
-	    nugetpack: {
-	        release: {
-	            src: 'src/' + pkg.name + '/' + pkg.name + '.csproj',
-	            dest: 'releases/nuget/'
-	        }
-	    },
 		zip: {
 		    release: {
 		        router: function (filepath) {
-		            return path.basename(filepath);
+					if (filepath.indexOf('/bin/Release/') >= 0) {
+						return filepath.split('/bin/Release/')[1];
+					} else {
+						return path.basename(filepath);
+					}
 		        },
-		        src: [
-					'src/' + pkg.name + '/bin/Release/Skybrud.Social.Core.dll',
-					'src/' + pkg.name + '/bin/Release/Skybrud.Social.Core.xml',
-					'src/' + pkg.name + '/bin/Release/' + pkg.name + '.dll',
-					'src/' + pkg.name + '/bin/Release/' + pkg.name + '.xml',
-					'src/' + pkg.name + '/LICENSE.txt'
+			    src: [
+					'src/' + pkg.name + '/bin/Release/*/*.dll',
+					'src/' + pkg.name + '/bin/Release/*/*.xml',
+					'src/LICENSE.html'
 				],
 		        dest: 'releases/github/' + pkg.name + '.v' + version + '.zip'
 			}
 		}
 	});
 
-	grunt.loadNpmTasks('grunt-nuget');
 	grunt.loadNpmTasks('grunt-zip');
 
-	grunt.registerTask('release', ['nugetpack', 'zip']);
+	grunt.registerTask('release', ['zip']);
 
 	grunt.registerTask('default', ['release']);
 
diff --git a/release.bat b/release.bat
new file mode 100644
index 0000000..c2f0833
--- /dev/null
+++ b/release.bat
@@ -0,0 +1,5 @@
+@echo off
+cd src/Skybrud.Social.Microsoft
+"C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin\msbuild.exe" /t:pack /p:Configuration=Release /p:PackageOutputPath=../../releases/nuget /p:RunBuildTargets=false
+cd ../../
+grunt
\ No newline at end of file
diff --git a/releases/github/Skybrud.Social.Microsoft.v1.0.0-beta002.zip b/releases/github/Skybrud.Social.Microsoft.v1.0.0-beta002.zip
new file mode 100644
index 0000000..b1299e6
Binary files /dev/null and b/releases/github/Skybrud.Social.Microsoft.v1.0.0-beta002.zip differ
diff --git a/releases/nuget/Skybrud.Social.Microsoft.1.0.0-beta002.nupkg b/releases/nuget/Skybrud.Social.Microsoft.1.0.0-beta002.nupkg
new file mode 100644
index 0000000..710238c
Binary files /dev/null and b/releases/nuget/Skybrud.Social.Microsoft.1.0.0-beta002.nupkg differ
diff --git a/src/Skybrud.Social.Microsoft/Properties/AssemblyInfo.json b/src/Skybrud.Social.Microsoft/Properties/AssemblyInfo.json
index c1320b9..868d1d7 100644
--- a/src/Skybrud.Social.Microsoft/Properties/AssemblyInfo.json
+++ b/src/Skybrud.Social.Microsoft/Properties/AssemblyInfo.json
@@ -1,10 +1,10 @@
 {
   "title": "Skybrud.Social.Microsoft",
   "description": "Authentication and service implementation for the various Microsoft APIs.",
-  "company": "Skybrud.dk",
+  "company": "Skybrud.dk a/s",
   "product": "Skybrud.Social",
-  "copyright": "Copyright © 2015",
+  "copyright": "Copyright © 2018",
   "version": "1.0.0.0",
-  "informationalVersion": "1.0.0-beta1",
-  "fileVersion": "0.0.170.3"
+  "informationalVersion": "1.0.0-beta002",
+  "fileVersion": "0.0.1073.8"
 }
\ No newline at end of file
diff --git a/src/Skybrud.Social.Microsoft/Properties/AssemblyInfoGenerated.cs b/src/Skybrud.Social.Microsoft/Properties/AssemblyInfoGenerated.cs
index 8046946..494ade6 100644
--- a/src/Skybrud.Social.Microsoft/Properties/AssemblyInfoGenerated.cs
+++ b/src/Skybrud.Social.Microsoft/Properties/AssemblyInfoGenerated.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyFileVersion("0.0.170.3")]
+[assembly: AssemblyFileVersion("0.0.1073.8")]
 
diff --git a/src/Skybrud.Social.Microsoft/Skybrud.Social.Microsoft.csproj b/src/Skybrud.Social.Microsoft/Skybrud.Social.Microsoft.csproj
index a887313..f53c0e0 100644
--- a/src/Skybrud.Social.Microsoft/Skybrud.Social.Microsoft.csproj
+++ b/src/Skybrud.Social.Microsoft/Skybrud.Social.Microsoft.csproj
@@ -10,11 +10,11 @@
 
   <PropertyGroup>
     <RootNamespace>Skybrud.Social.Microsoft</RootNamespace>
-    <Version>1.0.0-beta001</Version>
+    <Version>1.0.0-beta002</Version>
     <Company>Skybrud.dk a/s</Company>
     <Product>Skybrud.Social</Product>
     <Authors>Anders Bjerner</Authors>
-    <Copyright>Copyright © 2017</Copyright>
+    <Copyright>Copyright © 2018</Copyright>
     <Description>Authentication and service implementation for the various Microsoft APIs.</Description>
     <RepositoryUrl>https://github.com/abjerner/Skybrud.Social.Microsoft</RepositoryUrl>
   </PropertyGroup>
@@ -39,7 +39,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(SolutionName).xml</DocumentationFile>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Skybrud.Social.Microsoft.xml</DocumentationFile>
   </PropertyGroup>
   
   <Target Name="PreBuildEvent" BeforeTargets="DispatchToInnerBuilds" Condition="'$(RunBuildTargets)'=='true'">
@@ -47,7 +47,7 @@
   </Target>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="mkdir $(ProjectDir)bin\Dev\$(TargetFramework)&#xD;&#xA;xcopy $(ProjectDir)bin\$(ConfigurationName)\$(TargetFramework)\$(TargetName).* $(ProjectDir)bin\Dev\$(TargetFramework)\ /y&#xD;&#xA;&quot;$(SolutionDir)build\UpdateAssemblyInfoJson.exe&quot; &quot;$(ProjectPath)&quot; &quot;$(TargetPath)&quot;" />
+    <Exec Command="mkdir $(ProjectDir)bin\Dev\$(TargetFramework)&#xD;&#xA;xcopy $(ProjectDir)bin\$(ConfigurationName)\$(TargetFramework)\$(TargetName).* $(ProjectDir)bin\Dev\$(TargetFramework)\ /y&#xD;&#xA;&quot;$(ProjectDir)..\build\UpdateAssemblyInfoJson.exe&quot; &quot;$(ProjectPath)&quot; &quot;$(TargetPath)&quot;" />
   </Target>
 
 </Project>
\ No newline at end of file