diff --git a/Tokenizer/Tokenizer.csproj b/Tokenizer/Tokenizer.csproj
index c7ddc1d..e7d1d6d 100644
--- a/Tokenizer/Tokenizer.csproj
+++ b/Tokenizer/Tokenizer.csproj
@@ -2,7 +2,8 @@
   <PropertyGroup>
    <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-   <Version>2.1.0.0</Version>
+   <Version>2.1.0.1</Version>
+   <PackageVersion>2.1.0.1-beta</PackageVersion>
    <Authors>Chris Wood</Authors>
    <Company>flipbit.co.uk</Company>
    <PackageProjectUrl>http://github.com/flipbit/tokenizer</PackageProjectUrl>
diff --git a/appveyor.yml b/appveyor.yml
index a435de4..3e4604a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,14 +10,38 @@ image: Visual Studio 2017
 dotnet_csproj:
   patch: true
   file: '**\*.csproj'
-  version: '{version}'
-  package_version: '{version}'
-  assembly_version: '{version}'
-  file_version: '{version}'
-  informational_version: '{version}'
+  version: '$(assembly_version)'
+  package_version: '$(package_version)'
+  assembly_version: '$(assembly_version)'
+  file_version: '$(assembly_version)'
+  informational_version: '$(package_version)'
+environment:  
+  # Set library version 
+  major: 2
+  minor: 1 
+  patch: 2 
 init:
   # Good practise, because Windows line endings are different from Unix/Linux ones
   - cmd: git config --global core.autocrlf true
+  # Build version strings
+  - ps: |
+      $build = "$Env:APPVEYOR_BUILD_NUMBER"
+      $assembly_version = "$Env:major.$Env:minor.$Env:patch.0"
+
+      If ($Env:APPVEYOR_REPO_TAG -eq "true")
+      {
+          $package_version = "$($assembly_version)"
+      }
+      Else
+      {
+          $package_version = "$($assembly_version)-beta.$($build)"
+      }
+
+      Set-AppveyorBuildVariable -Name "assembly_version" -Value $assembly_version
+      Set-AppveyorBuildVariable -Name "package_version" -Value $package_version
+
+      Write-Host "Using Assembly Version: $($assembly_version)"
+      Write-Host "Using Package Version: $($package_version)"
 install:
   # Install repo specific stuff here
 before_build: