diff --git a/.gitignore b/.gitignore
index 61b1c211..1a7759c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -235,3 +235,4 @@ _Pvt_Extensions
 
 # FAKE - F# Make
 .fake/
+tools/
diff --git a/Ocelot.sln b/Ocelot.sln
index 0165beb0..c1f647af 100644
--- a/Ocelot.sln
+++ b/Ocelot.sln
@@ -11,6 +11,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		appveyor.yml = appveyor.yml
 		build-and-run-tests.bat = build-and-run-tests.bat
 		build.bat = build.bat
+		build.cake = build.cake
+		build.ps1 = build.ps1
 		configuration-explanation.txt = configuration-explanation.txt
 		global.json = global.json
 		LICENSE.md = LICENSE.md
diff --git a/build.cake b/build.cake
new file mode 100644
index 00000000..513f99dd
--- /dev/null
+++ b/build.cake
@@ -0,0 +1,218 @@
+#tool "nuget:?package=GitVersion.CommandLine"
+#tool "nuget:?package=OpenCover"
+#tool "nuget:?package=ReportGenerator"
+#tool "nuget:?package=GitReleaseNotes"
+#addin nuget:?package=Cake.DoInDirectory
+
+var target = Argument("target", "Default");
+var artifactsDir = Directory("artifacts");
+
+Information("target is " +target);
+
+// versioning
+var committedVersion = "0.0.0-dev";
+var buildVersion = committedVersion;
+
+//compile
+var compileConfig = Argument("configuration", "Release");
+Information("Build configuration is " + compileConfig);	
+
+// unit testing
+var artifactsForUnitTestsDir = artifactsDir + Directory("UnitTests");
+var unitTestAssemblies = @"./test/Ocelot.UnitTests";
+
+// acceptance testing
+var artifactsForAcceptanceTestsDir = artifactsDir + Directory("AcceptanceTests");
+var acceptanceTestAssemblies = @"./test/Ocelot.AcceptanceTests";
+
+//benchmark testing
+var artifactsForBenchmarkTestsDir = artifactsDir + Directory("BenchmarkTests");
+var benchmarkTestAssemblies = @"./test/Ocelot.Benchmarks";
+
+// packaging
+var packagesDir = artifactsDir + Directory("Packages");
+var projectJson = "./src/Ocelot/project.json";
+
+// release notes
+var releaseNotesFile = packagesDir + File("releasenotes.md");
+
+Task("Default")
+	.IsDependentOn("RunTests")
+	.IsDependentOn("Package")
+	.Does(() =>
+	{
+	});
+
+Task("Clean")
+	.Does(() =>
+	{
+        if (DirectoryExists(artifactsDir))
+        {
+            DeleteDirectory(artifactsDir, recursive:true);
+        }
+        CreateDirectory(artifactsDir);
+	});
+	
+Task("Version")
+	.Does(() =>
+	{
+		var nugetVersion = GetVersion();
+		Information("SemVer version number: " + nugetVersion);
+
+		if (AppVeyor.IsRunningOnAppVeyor)
+		{
+			Information("Persisting version number...");
+			PersistVersion(nugetVersion);
+			buildVersion = nugetVersion;
+		}
+		else
+		{
+			Information("We are not running on build server, so we won't persist the version number.");
+		}
+	});
+
+Task("Restore")
+	.IsDependentOn("Clean")
+	.IsDependentOn("Version")
+	.Does(() =>
+	{	
+		DotNetCoreRestore("./src");
+		DotNetCoreRestore("./test");
+	});
+
+Task("RunUnitTests")
+	.IsDependentOn("Restore")
+	.Does(() =>
+	{
+		var buildSettings = new DotNetCoreTestSettings
+		{
+			Configuration = compileConfig,
+		};
+
+		EnsureDirectoryExists(artifactsForUnitTestsDir);
+		DotNetCoreTest(unitTestAssemblies, buildSettings);
+	});
+
+Task("RunAcceptanceTests")
+	.IsDependentOn("Restore")
+	.Does(() =>
+	{
+		var buildSettings = new DotNetCoreTestSettings
+		{
+			Configuration = "Debug", //acceptance test config is hard-coded for debug
+		};
+
+		EnsureDirectoryExists(artifactsForAcceptanceTestsDir);
+
+		DoInDirectory("test/Ocelot.AcceptanceTests", () =>
+		{
+			DotNetCoreTest(".", buildSettings);
+		});
+
+	});
+
+Task("RunBenchmarkTests")
+	.IsDependentOn("Restore")
+	.Does(() =>
+	{
+		var buildSettings = new DotNetCoreRunSettings
+		{
+			Configuration = compileConfig,
+		};
+
+		EnsureDirectoryExists(artifactsForBenchmarkTestsDir);
+
+		DoInDirectory(benchmarkTestAssemblies, () =>
+		{
+			DotNetCoreRun(".", "--args", buildSettings);
+		});
+	});
+
+Task("RunTests")
+	.IsDependentOn("RunUnitTests")
+	.IsDependentOn("RunAcceptanceTests")
+	.Does(() =>
+	{
+	});
+
+Task("Package")
+	.Does(() => 
+	{
+		EnsureDirectoryExists(packagesDir);
+        
+		GenerateReleaseNotes();
+
+		var settings = new DotNetCorePackSettings
+			{
+				OutputDirectory = packagesDir,
+				NoBuild = true
+			};
+
+		DotNetCorePack(projectJson, settings);
+
+        System.IO.File.WriteAllLines(packagesDir + File("artifacts"), new[]{
+            "nuget:Ocelot." + buildVersion + ".nupkg",
+            "nugetSymbols:Ocelot." + buildVersion + ".symbols.nupkg",
+            "releaseNotes:releasenotes.md"
+        });
+
+		if (AppVeyor.IsRunningOnAppVeyor)
+		{
+			var path = packagesDir.ToString() + @"/**/*";
+
+			foreach (var file in GetFiles(path))
+			{
+				AppVeyor.UploadArtifact(file.FullPath);
+			}
+		}
+	});
+
+RunTarget(target);
+
+private string GetVersion()
+{
+    GitVersion(new GitVersionSettings{
+        UpdateAssemblyInfo = false,
+        OutputType = GitVersionOutput.BuildServer
+    });
+
+    var versionInfo = GitVersion(new GitVersionSettings{ OutputType = GitVersionOutput.Json });
+	return versionInfo.NuGetVersion;
+}
+
+private void PersistVersion(string version)
+{
+	Information(string.Format("We'll search all project.json files for {0} and replace with {1}...", committedVersion, version));
+	var projectJsonFiles = GetFiles("./**/project.json");
+
+	foreach(var projectJsonFile in projectJsonFiles)
+	{
+		var file = projectJsonFile.ToString();
+ 
+		Information(string.Format("Updating {0}...", file));
+
+		var updatedProjectJson = System.IO.File.ReadAllText(file)
+			.Replace(committedVersion, version);
+
+		System.IO.File.WriteAllText(file, updatedProjectJson);
+	}
+}
+
+private void GenerateReleaseNotes()
+{
+	Information("Generating release notes at " + releaseNotesFile);
+
+    var releaseNotesExitCode = StartProcess(
+        @"tools/GitReleaseNotes/tools/gitreleasenotes.exe", 
+        new ProcessSettings { Arguments = ". /o " + releaseNotesFile });
+
+    if (string.IsNullOrEmpty(System.IO.File.ReadAllText(releaseNotesFile)))
+	{
+        System.IO.File.WriteAllText(releaseNotesFile, "No issues closed since last release");
+	}
+
+    if (releaseNotesExitCode != 0) 
+	{
+		throw new Exception("Failed to generate release notes");
+	}
+}
\ No newline at end of file
diff --git a/build.ps1 b/build.ps1
new file mode 100644
index 00000000..44de5793
--- /dev/null
+++ b/build.ps1
@@ -0,0 +1,189 @@
+##########################################################################
+# This is the Cake bootstrapper script for PowerShell.
+# This file was downloaded from https://github.com/cake-build/resources
+# Feel free to change this file to fit your needs.
+##########################################################################
+
+<#
+
+.SYNOPSIS
+This is a Powershell script to bootstrap a Cake build.
+
+.DESCRIPTION
+This Powershell script will download NuGet if missing, restore NuGet tools (including Cake)
+and execute your Cake build script with the parameters you provide.
+
+.PARAMETER Script
+The build script to execute.
+.PARAMETER Target
+The build script target to run.
+.PARAMETER Configuration
+The build configuration to use.
+.PARAMETER Verbosity
+Specifies the amount of information to be displayed.
+.PARAMETER Experimental
+Tells Cake to use the latest Roslyn release.
+.PARAMETER WhatIf
+Performs a dry run of the build script.
+No tasks will be executed.
+.PARAMETER Mono
+Tells Cake to use the Mono scripting engine.
+.PARAMETER SkipToolPackageRestore
+Skips restoring of packages.
+.PARAMETER ScriptArgs
+Remaining arguments are added here.
+
+.LINK
+http://cakebuild.net
+
+#>
+
+[CmdletBinding()]
+Param(
+    [string]$Script = "build.cake",
+    [string]$Target = "Default",
+    [ValidateSet("Release", "Debug")]
+    [string]$Configuration = "Release",
+    [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")]
+    [string]$Verbosity = "Verbose",
+    [switch]$Experimental,
+    [Alias("DryRun","Noop")]
+    [switch]$WhatIf,
+    [switch]$Mono,
+    [switch]$SkipToolPackageRestore,
+    [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)]
+    [string[]]$ScriptArgs
+)
+
+[Reflection.Assembly]::LoadWithPartialName("System.Security") | Out-Null
+function MD5HashFile([string] $filePath)
+{
+    if ([string]::IsNullOrEmpty($filePath) -or !(Test-Path $filePath -PathType Leaf))
+    {
+        return $null
+    }
+
+    [System.IO.Stream] $file = $null;
+    [System.Security.Cryptography.MD5] $md5 = $null;
+    try
+    {
+        $md5 = [System.Security.Cryptography.MD5]::Create()
+        $file = [System.IO.File]::OpenRead($filePath)
+        return [System.BitConverter]::ToString($md5.ComputeHash($file))
+    }
+    finally
+    {
+        if ($file -ne $null)
+        {
+            $file.Dispose()
+        }
+    }
+}
+
+Write-Host "Preparing to run build script..."
+
+if(!$PSScriptRoot){
+    $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
+}
+
+$TOOLS_DIR = Join-Path $PSScriptRoot "tools"
+$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe"
+$CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe"
+$NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
+$PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config"
+$PACKAGES_CONFIG_MD5 = Join-Path $TOOLS_DIR "packages.config.md5sum"
+
+# Should we use mono?
+$UseMono = "";
+if($Mono.IsPresent) {
+    Write-Verbose -Message "Using the Mono based scripting engine."
+    $UseMono = "-mono"
+}
+
+# Should we use the new Roslyn?
+$UseExperimental = "";
+if($Experimental.IsPresent -and !($Mono.IsPresent)) {
+    Write-Verbose -Message "Using experimental version of Roslyn."
+    $UseExperimental = "-experimental"
+}
+
+# Is this a dry run?
+$UseDryRun = "";
+if($WhatIf.IsPresent) {
+    $UseDryRun = "-dryrun"
+}
+
+# Make sure tools folder exists
+if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) {
+    Write-Verbose -Message "Creating tools directory..."
+    New-Item -Path $TOOLS_DIR -Type directory | out-null
+}
+
+# Make sure that packages.config exist.
+if (!(Test-Path $PACKAGES_CONFIG)) {
+    Write-Verbose -Message "Downloading packages.config..."
+    try { (New-Object System.Net.WebClient).DownloadFile("http://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG) } catch {
+        Throw "Could not download packages.config."
+    }
+}
+
+# Try find NuGet.exe in path if not exists
+if (!(Test-Path $NUGET_EXE)) {
+    Write-Verbose -Message "Trying to find nuget.exe in PATH..."
+    $existingPaths = $Env:Path -Split ';' | Where-Object { (![string]::IsNullOrEmpty($_)) -and (Test-Path $_) }
+    $NUGET_EXE_IN_PATH = Get-ChildItem -Path $existingPaths -Filter "nuget.exe" | Select -First 1
+    if ($NUGET_EXE_IN_PATH -ne $null -and (Test-Path $NUGET_EXE_IN_PATH.FullName)) {
+        Write-Verbose -Message "Found in PATH at $($NUGET_EXE_IN_PATH.FullName)."
+        $NUGET_EXE = $NUGET_EXE_IN_PATH.FullName
+    }
+}
+
+# Try download NuGet.exe if not exists
+if (!(Test-Path $NUGET_EXE)) {
+    Write-Verbose -Message "Downloading NuGet.exe..."
+    try {
+        (New-Object System.Net.WebClient).DownloadFile($NUGET_URL, $NUGET_EXE)
+    } catch {
+        Throw "Could not download NuGet.exe."
+    }
+}
+
+# Save nuget.exe path to environment to be available to child processed
+$ENV:NUGET_EXE = $NUGET_EXE
+
+# Restore tools from NuGet?
+if(-Not $SkipToolPackageRestore.IsPresent) {
+    Push-Location
+    Set-Location $TOOLS_DIR
+
+    # Check for changes in packages.config and remove installed tools if true.
+    [string] $md5Hash = MD5HashFile($PACKAGES_CONFIG)
+    if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or
+      ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) {
+        Write-Verbose -Message "Missing or changed package.config hash..."
+        Remove-Item * -Recurse -Exclude packages.config,nuget.exe
+    }
+
+    Write-Verbose -Message "Restoring tools from NuGet..."
+    $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`""
+
+    if ($LASTEXITCODE -ne 0) {
+        Throw "An error occured while restoring NuGet tools."
+    }
+    else
+    {
+        $md5Hash | Out-File $PACKAGES_CONFIG_MD5 -Encoding "ASCII"
+    }
+    Write-Verbose -Message ($NuGetOutput | out-string)
+    Pop-Location
+}
+
+# Make sure that Cake has been installed.
+if (!(Test-Path $CAKE_EXE)) {
+    Throw "Could not find Cake.exe at $CAKE_EXE"
+}
+
+# Start Cake
+Write-Host "Running build script..."
+Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" -target=`"$Target`" -configuration=`"$Configuration`" -verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs"
+exit $LASTEXITCODE
\ No newline at end of file
diff --git a/src/Ocelot/project.json b/src/Ocelot/project.json
index 85008568..8d259469 100644
--- a/src/Ocelot/project.json
+++ b/src/Ocelot/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-*",
+  "version": "0.0.0-dev",
 
   "dependencies": {
     "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0",
diff --git a/test/Ocelot.AcceptanceTests/project.json b/test/Ocelot.AcceptanceTests/project.json
index 4b364510..17f35a3c 100644
--- a/test/Ocelot.AcceptanceTests/project.json
+++ b/test/Ocelot.AcceptanceTests/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-*",
+  "version": "0.0.0-dev",
 
   "buildOptions": {
     "copyToOutput": {
@@ -22,10 +22,10 @@
     "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0",
     "Microsoft.AspNetCore.Http": "1.1.0",
     "Microsoft.DotNet.InternalAbstractions": "1.0.0",
-    "Ocelot": "1.0.0-*",
+    "Ocelot": "0.0.0-dev",
     "xunit": "2.2.0-beta2-build3300",
     "dotnet-test-xunit": "2.2.0-preview2-build1029",
-    "Ocelot.ManualTest": "1.0.0-*",
+    "Ocelot.ManualTest": "0.0.0-dev",
     "Microsoft.AspNetCore.TestHost": "1.1.0",
     "IdentityServer4": "1.0.1",
     "Microsoft.AspNetCore.Mvc": "1.1.0",
@@ -36,7 +36,7 @@
   },
   "runtimes": {
     "win10-x64": {},
-    "osx.10.11-x64":{},
+    "osx.10.11-x64": {},
     "win7-x64": {}
   },
   "frameworks": {
diff --git a/test/Ocelot.Benchmarks/project.json b/test/Ocelot.Benchmarks/project.json
index da310ddd..5f7a4987 100644
--- a/test/Ocelot.Benchmarks/project.json
+++ b/test/Ocelot.Benchmarks/project.json
@@ -1,11 +1,11 @@
 {
-  "version": "1.0.0-*",
+  "version": "0.0.0-dev",
   "buildOptions": {
     "emitEntryPoint": true
   },
 
   "dependencies": {
-    "Ocelot": "1.0.0-*",
+    "Ocelot": "0.0.0-dev",
     "BenchmarkDotNet": "0.10.1"
   },
   "runtimes": {
diff --git a/test/Ocelot.ManualTest/project.json b/test/Ocelot.ManualTest/project.json
index 181bdb07..3ae09ccb 100644
--- a/test/Ocelot.ManualTest/project.json
+++ b/test/Ocelot.ManualTest/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-*",
+  "version": "0.0.0-dev",
 
   "dependencies": {
     "Microsoft.AspNetCore.Http": "1.1.0",
@@ -10,7 +10,7 @@
     "Microsoft.Extensions.Logging.Console": "1.1.0",
     "Microsoft.Extensions.Logging.Debug": "1.1.0",
     "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0",
-    "Ocelot": "1.0.0-*",
+    "Ocelot": "0.0.0-dev",
     "Microsoft.AspNetCore.Server.Kestrel": "1.1.0",
     "Microsoft.NETCore.App": "1.1.0"
   },
diff --git a/test/Ocelot.UnitTests/project.json b/test/Ocelot.UnitTests/project.json
index 605b25d6..ab3e6cb1 100644
--- a/test/Ocelot.UnitTests/project.json
+++ b/test/Ocelot.UnitTests/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-*",
+  "version": "0.0.0-dev",
 
   "testRunner": "xunit",
 
@@ -13,7 +13,7 @@
     "Microsoft.Extensions.Logging.Debug": "1.1.0",
     "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0",
     "Microsoft.AspNetCore.Http": "1.1.0",
-    "Ocelot": "1.0.0-*",
+    "Ocelot": "0.0.0-dev",
     "xunit": "2.2.0-beta2-build3300",
     "dotnet-test-xunit": "2.2.0-preview2-build1029",
     "Moq": "4.6.38-alpha",
diff --git a/version.ps1 b/version.ps1
new file mode 100644
index 00000000..621201b6
--- /dev/null
+++ b/version.ps1
@@ -0,0 +1 @@
+.\tools\GitVersion.CommandLine\tools\GitVersion.exe
\ No newline at end of file