diff --git a/.gitignore b/.gitignore
index 77b9880e..5ab174bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,35 +1,27 @@
-src/CommandLine/bin/*
-src/CommandLine/obj
-src/CommandLine.dotnet/bin/*
-src/CommandLine.dotnet/obj
-demo/ReadText.Demo/bin/*
-demo/ReadText.Demo/obj
-/demo/ReadText.Demo.VB/bin/*
-/demo/ReadText.Demo.VB/obj
-tests/CommandLine.Tests/bin/*
-tests/CommandLine.Tests/obj
-tests/CommandLine.DotNet.Tests/bin/*
-tests/CommandLine.DotNet.Tests/obj
-tests/CommandLine.Tests.Properties/bin/*
-tests/CommandLine.Tests.Properties/obj
-src/templates/CSharpTemplate/bin/*
-src/templates/CSharpTemplate/obj 
-src/templates/VBNetTemplate/bin/*
-src/templates/VBNetTemplate/obj
+
+#ignore build outputs
+[B|b]in
+[O|o]bj
 build/*
+
+#ignore managed external libs
 packages
 paket-files
+
 *.suo
 *.userprefs
 *~
 \#*\#
 *.pidb
+
+#ignore Test results/temps
 *.test-cache
 tests/CommandLine/test-results/*
 tests/CommandLine.Tests/test-results/*
+TestResult.xml
+
 *.DS_Store
 *.csproj.user
-TestResult.xml
 *.nupkg
 *.old
 StyleCop.Cache
@@ -43,6 +35,6 @@ artifacts/*
 *.lock.json
 *.nuget.props
 *.DotSettings.user
-# Visual Studio 2015 cache/options directory
-.vs/
+# Visual Studio 2015 cache/options directory
+.vs/
 
diff --git a/CommandLine.nuspec b/CommandLine.nuspec
index c517e43c..4d4fde5a 100644
--- a/CommandLine.nuspec
+++ b/CommandLine.nuspec
@@ -2,12 +2,12 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>CommandLineParser</id>
-    <version>2.1.0-beta2</version>
+    <version>$version$</version>
     <title>Command Line Parser Library</title>
     <authors>Giacomo Stelluti Scala</authors>
     <description>Terse syntax C# command line parser for .NET with F# support. The Command Line Parser Library offers to CLR applications a clean and concise API for manipulating command line arguments and related tasks.</description>
     <releaseNotes />
-    <copyright>Copyright (c) 2005 - 2016 Giacomo Stelluti Scala</copyright>
+    <copyright>Copyright (c) 2005 - 2017 Giacomo Stelluti Scala &amp; Contributors</copyright>
     <licenseUrl>https://github.com/commandlineparser/commandline/blob/master/License.md</licenseUrl>
     <projectUrl>https://github.com/commandlineparser/commandline</projectUrl>
     <owners>Giacomo Stelluti Scala</owners>
diff --git a/appveyor.yml b/appveyor.yml
index ebc8c428..70e9da61 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,25 +1,51 @@
-version: 0.0.1.{build}
+#version should be changed with any pull requests
+version: 2.2.0.{build}
 
 clone_depth: 1
 pull_requests:
   do_not_increment_build_number: true
 
+cache:
+- packages -> paket.dependencies
+
 init:
-  - git config --global core.autocrlf input
+  - ps: >
+      git config --global core.autocrlf input
+      
+      if ($env:APPVEYOR_REPO_TAG -eq "true")
+      
+      {
+      
+        Update-AppveyorBuild -Version "$env:APPVEYOR_REPO_TAG_NAME"
+      
+      }
+      
+      else
+      
+      {
+        $ver = $env:APPVEYOR_BUILD_VERSION
+        $commit = $env:APPVEYOR_REPO_COMMIT.substring(0,7)
+        Update-AppveyorBuild -Version "$ver-$commit"
+      
+      }
 
 build_script:
   - cmd: build.cmd
 
-test: off
+after_build:
+- cmd: nuget pack CommandLine.nuspec -version %APPVEYOR_BUILD_VERSION%
+
+test: off  #tests handled within FAKE
 
 artifacts:
-- path: build/*.nupkg
+- path: '*.nupkg'
   name: NugetPackage
 
 deploy:
 - provider: NuGet
   api_key:
-    secure: sQzzieUQGkTU0CvzXLcv5Wph6K7h3T+8teovqwa/Dzk1p9WhpmuUHiRxd3U0YhqO
+    secure: +Zxb8M5W+UJV1yd9n8seu3PvH/hGNPEmgriGBnsSmtxjKPQAJ4+iL7tKAmfPHAuG
   artifact: 'NuGetPackage'
   on:
-    branch: release
+    branch: master
+    APPVEYOR_REPO_TAG: true
diff --git a/src/CommandLine/Infrastructure/EnumerableExtensions`1.cs b/src/CommandLine/Infrastructure/EnumerableExtensions`1.cs
index 7266aede..056fa152 100644
--- a/src/CommandLine/Infrastructure/EnumerableExtensions`1.cs
+++ b/src/CommandLine/Infrastructure/EnumerableExtensions`1.cs
@@ -37,9 +37,9 @@ public static bool Empty<TSource>(this IEnumerable<TSource> source)
         /// <summary>
         /// Breaks a collection into groups of a specified size.
         /// </summary>
-        /// <param name="source">A collection of <typeparam name="T"/>.
+        /// <param name="source">A collection of <typeparam name="T"/>.</param>
         /// <param name="groupSize">The number of items each group shall contain.</param>
-        /// <returns>An enumeration of <typeparam name="T"/>[].</returns>
+        /// <returns>An enumeration of T[].</returns>
         /// <remarks>An incomplete group at the end of the source collection will be silently dropped.</remarks>
         public static IEnumerable<T[]> Group<T>(this IEnumerable<T> source, int groupSize)
         {
diff --git a/src/SharedAssemblyInfo.cs b/src/SharedAssemblyInfo.cs
index 91a1085d..25e1cd7d 100644
--- a/src/SharedAssemblyInfo.cs
+++ b/src/SharedAssemblyInfo.cs
@@ -5,8 +5,9 @@
 
 [assembly: AssemblyProduct("Command Line Parser Library")]
 [assembly: AssemblyCopyright("Copyright (c) 2005 - 2015 Giacomo Stelluti Scala")]
+[assembly: NeutralResourcesLanguage("en-US")]
+
+// versions are replaced during CI build
 [assembly: AssemblyVersion("2.0.275.0")]
 [assembly: AssemblyFileVersion("2.0.275.0")]
-
 [assembly: AssemblyInformationalVersion("2.0.275-beta")]
-[assembly: NeutralResourcesLanguage("en-US")]
\ No newline at end of file