diff --git a/Deploy.targets b/Deploy.targets
new file mode 100644
index 0000000..a5f9153
--- /dev/null
+++ b/Deploy.targets
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<Import Project="SimpleLog.Targets"/>
+
+	<PropertyGroup>
+		<DeploymentServer>tommymontgomery.com</DeploymentServer>
+		<UnitTestsDir>$(MSBuildProjectDirectory)\SimpleLog.Tests</UnitTestsDir>
+	</PropertyGroup>
+	
+	<Target Name="Deploy" DependsOnTargets="Clean">
+		<MSBuild Projects="SimpleLog\SimpleLog.csproj" Properties="Configuration=Release"/>
+		
+		<Message Text="Running unit tests" Importance="High"/>
+		<CallTarget Targets="RunUnitTests"/>
+		<CallTarget Targets="CleanUnitTests"/>
+		
+		<CreateItem Include="$(MSBuildProjectDirectory)\SimpleLog\bin\Release\*.*">
+			<Output TaskParameter="Include" ItemName="DeploymentFiles"/>
+		</CreateItem>
+		
+		<Zip Files="@(DeploymentFiles)" ZipFileName="SimpleLog\bin\Release\SimpleLog.zip" WorkingDirectory="$(MSBuildProjectDirectory)\SimpleLog\bin\Release"/>
+	</Target>
+	
+	<Target Name="BuildUnitTests">
+		<MSBuild Projects="SimpleLog.Tests\SimpleLog.Tests.csproj" Properties="Configuration=Release"/>
+	</Target>
+	
+	<Target Name="RunUnitTests" DependsOnTargets="BuildUnitTests">
+		<CreateItem Include="$(UnitTestsDir)\bin\Release\*.Tests.dll">
+			<Output TaskParameter="Include" ItemName="UnitTestAssemblies"/>
+		</CreateItem>
+		<NUnit ToolPath="c:\code\nunit\bin" Assemblies="@(UnitTestAssemblies)" WorkingDirectory="$(MSBuildProjectDirectory)\SimpleLog.Tests\bin\Release"/>
+	</Target>
+	
+	<Target Name="CleanUnitTests">
+		<RemoveDir Directories="$(UnitTestsDir)\bin;$(UnitTestsDir)\obj"/>
+	</Target>
+	
+</Project>
diff --git a/SimpleLog.targets b/SimpleLog.targets
index b6863cc..3d29315 100644
--- a/SimpleLog.targets
+++ b/SimpleLog.targets
@@ -11,6 +11,7 @@
 		<RevisionNumber>0</RevisionNumber>
 		<PropertiesDir>Properties</PropertiesDir>
 		<BuildDependsOn>
+			Clean;
 			ConfigureVersionNumber;
 			CreateAssemblyInfo;
 			$(BuildDependsOn)
@@ -57,9 +58,7 @@
 	</Target>
 	
 	<Target Name="Clean">
-		<RemoveDir Directories="$(PropertiesDir)"/>
-		<RemoveDir Directories="bin"/>
-		<RemoveDir Directories="obj"/>
+		<RemoveDir Directories="$(PropertiesDir);bin;obj"/>
 	</Target>
 	
 </Project>
diff --git a/build_debug.bat b/build_debug.bat
index f08a596..19a1fe7 100644
--- a/build_debug.bat
+++ b/build_debug.bat
@@ -1 +1 @@
-%WINDIR%\Microsoft.NET\Framework\v3.5\MSBuild.exe /property:Configuration=Debug SimpleLog.sln
+%WINDIR%\Microsoft.NET\Framework\v3.5\MSBuild.exe /nologo /property:Configuration=Debug SimpleLog.sln
diff --git a/build_release.bat b/build_release.bat
index f861479..b4ee022 100644
--- a/build_release.bat
+++ b/build_release.bat
@@ -1 +1 @@
-%WINDIR%\Microsoft.NET\Framework\v3.5\MSBuild.exe /property:Configuration=Release SimpleLog/SimpleLog.csproj
+%WINDIR%\Microsoft.NET\Framework\v3.5\MSBuild.exe /nologo /property:Configuration=Release SimpleLog/SimpleLog.csproj
diff --git a/clean.bat b/clean.bat
index 16fbc9f..94bc4c1 100644
--- a/clean.bat
+++ b/clean.bat
@@ -1 +1 @@
-%WINDIR%\Microsoft.NET\Framework\v3.5\MSBuild.exe /target:Clean SimpleLog.sln
\ No newline at end of file
+%WINDIR%\Microsoft.NET\Framework\v3.5\MSBuild.exe /nologo /target:Clean SimpleLog.sln
\ No newline at end of file
diff --git a/deploy.bat b/deploy.bat
new file mode 100644
index 0000000..cc84b92
--- /dev/null
+++ b/deploy.bat
@@ -0,0 +1 @@
+%WINDIR%\Microsoft.NET\Framework\v3.5\MSBuild.exe /nologo /target:Deploy Deploy.targets