diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbc45bfebf..ac1ed1a27f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,15 @@
 # Changelog
 
-## 6.2.2 (git master)
+## 7.0.0 (git master)
+* Added support for reading recurring exceptions from MPP and MSPDI files.
+* Updated RecurringTask class interface (Note: this is a breaking API change)
+* MSPDI writer now uses save version 14 by default (Note: this may affect applications which consume MSPDI files you generate)
+* Correctly handle MSPDI files with Byte Order Marks.
+* Handle MSPDI files with varying namespaces.
+* Improve robustness Merlin file reader.
+* Improve extraction of task start and finish dates from PMXML files only containing partial data.
+* Prevent POI from closing the input stream when using UniversalProjectReader
+* Cannot read mpp file using getProjectReader.
 
 ## 6.2.1 (11/10/2017)
 * Gracefully handle corrupt MPP files.
diff --git a/build.xml b/build.xml
index 304afeed2b..c1da3c4627 100644
--- a/build.xml
+++ b/build.xml
@@ -9,7 +9,7 @@
 	<target name="init-props" description="Initialize properties">
 		<tstamp />
 
-		<property name="current.version" value="6.2.1" />
+		<property name="current.version" value="7.0.0" />
 		<property name="ikvm.dir" value="${basedir}/../ikvm-8.0.5449.1" />
 		<property name="nuget.dir" value="${basedir}/../nuget" />
 		<property name="ruby.dir" value="C:/Ruby21"/>
@@ -396,7 +396,13 @@
 		<xslt in="${basedir}/maven/src/changes/changes.xml" out="${basedir}/CHANGELOG.md" style="${basedir}/doc/changelog.xsl"/> 
 	</target>
 
-	<target name="archive" depends="jar,ikvm-dll,vs-dll,changelog" description="Create library files"/>
+	<target name="releasenote" depends="init-props" description="Create release.md">
+		<xslt in="${basedir}/maven/src/changes/changes.xml" out="${basedir}/../release.md" style="${basedir}/doc/releasenote.xsl">
+			<param name="version" expression="${current.version}"/>
+		</xslt>
+	</target>
+
+	<target name="archive" depends="jar,ikvm-dll,vs-dll,changelog,releasenote" description="Create library files"/>
 
 	<target name="distribute" depends="archive,clean-java,clean-dot-net,nuget-package" description="Create distribution">
 		<zip zipfile="${distribution}">
@@ -544,6 +550,18 @@
 		</exec>
 	</target>
 
+	<target name="github-deploy" depends="init-props" description="Deploy to GitHub">
+		<exec executable="hub">
+			<arg line="tag v${current.version}" />
+		</exec>
+		<exec executable="hub">
+			<arg line="push origin v${current.version}" />
+		</exec>
+		<exec executable="hub">
+			<arg line='release create v${current.version} -a ${distribution} -f ${basedir}/../release.md'/>
+		</exec>
+	</target>
+	
 	<!-- Adapted from http://stackoverflow.com/questions/2974106/how-to-lookup-the-latest-git-commit-hash-from-an-ant-build-script -->
 	<target name="git.revision" description="Store git revision in ${repository.version}">
 	    <exec executable="git" outputproperty="git.revision" failifexecutionfails="false" errorproperty="">
diff --git a/doc/releasenote.xsl b/doc/releasenote.xsl
new file mode 100644
index 0000000000..be33969113
--- /dev/null
+++ b/doc/releasenote.xsl
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:param name="version"/>
+<xsl:output indent="no" method="text" omit-xml-declaration="yes"/>
+<xsl:template match="/">Version <xsl:value-of select="$version"/><xsl:value-of select="text()"/><xsl:text>&#xa;</xsl:text>
+<xsl:for-each select="/document/body/release[@version=$version]">
+<xsl:for-each select="action">* <xsl:value-of select="text()"/><xsl:text>&#xa;</xsl:text></xsl:for-each>
+</xsl:for-each>
+</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/maven/pom.xml b/maven/pom.xml
index 239d5e4ede..17ce5befa1 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -8,7 +8,7 @@
 	<artifactId>mpxj</artifactId>
 
 	<!-- Note - this is automatically updated by the ant build ... don't remove the MPXJ comment! -->
-	<!-- MPXJ --><version>6.2.1</version>
+	<!-- MPXJ --><version>7.0.0</version>
 
 	<name>MPXJ</name>
 	<url>http://mpxj.org</url>
diff --git a/src.net/MpxjConvert/Properties/AssemblyInfo.cs b/src.net/MpxjConvert/Properties/AssemblyInfo.cs
index 6a4087a187..c44386b81f 100644
--- a/src.net/MpxjConvert/Properties/AssemblyInfo.cs
+++ b/src.net/MpxjConvert/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("6.2.1.0")]
-[assembly: AssemblyVersion("6.2.1.0")]
-[assembly: AssemblyFileVersion("6.2.1.0")]
+// [assembly: AssemblyVersion("7.0.0.0")]
+[assembly: AssemblyVersion("7.0.0.0")]
+[assembly: AssemblyFileVersion("7.0.0.0")]
diff --git a/src.net/MpxjCreate/MpxjCreate/Properties/AssemblyInfo.cs b/src.net/MpxjCreate/MpxjCreate/Properties/AssemblyInfo.cs
index da2bb35d7f..16b45ad065 100644
--- a/src.net/MpxjCreate/MpxjCreate/Properties/AssemblyInfo.cs
+++ b/src.net/MpxjCreate/MpxjCreate/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("6.2.1.0")]
-[assembly: AssemblyVersion("6.2.1.0")]
-[assembly: AssemblyFileVersion("6.2.1.0")]
+// [assembly: AssemblyVersion("7.0.0.0")]
+[assembly: AssemblyVersion("7.0.0.0")]
+[assembly: AssemblyFileVersion("7.0.0.0")]
diff --git a/src.net/MpxjQuery/Properties/AssemblyInfo.cs b/src.net/MpxjQuery/Properties/AssemblyInfo.cs
index 6f017fdf0c..fe9f081474 100644
--- a/src.net/MpxjQuery/Properties/AssemblyInfo.cs
+++ b/src.net/MpxjQuery/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("6.2.1.0")]
-[assembly: AssemblyVersion("6.2.1.0")]
-[assembly: AssemblyFileVersion("6.2.1.0")]
+// [assembly: AssemblyVersion("7.0.0.0")]
+[assembly: AssemblyVersion("7.0.0.0")]
+[assembly: AssemblyFileVersion("7.0.0.0")]
diff --git a/src.net/MpxjTest/Properties/AssemblyInfo.cs b/src.net/MpxjTest/Properties/AssemblyInfo.cs
index dfcc2ed04e..2b04319cb2 100644
--- a/src.net/MpxjTest/Properties/AssemblyInfo.cs
+++ b/src.net/MpxjTest/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("6.2.1.0")]
-[assembly: AssemblyVersion("6.2.1.0")]
-[assembly: AssemblyFileVersion("6.2.1.0")]
+// [assembly: AssemblyVersion("7.0.0.0")]
+[assembly: AssemblyVersion("7.0.0.0")]
+[assembly: AssemblyFileVersion("7.0.0.0")]
diff --git a/src.net/MpxjUtilities/Properties/AssemblyInfo.cs b/src.net/MpxjUtilities/Properties/AssemblyInfo.cs
index 227928e2c0..242b6832f7 100644
--- a/src.net/MpxjUtilities/Properties/AssemblyInfo.cs
+++ b/src.net/MpxjUtilities/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-// [assembly: AssemblyVersion("6.2.1.0")]
-[assembly: AssemblyVersion("6.2.1.0")]
-[assembly: AssemblyFileVersion("6.2.1.0")]
+// [assembly: AssemblyVersion("7.0.0.0")]
+[assembly: AssemblyVersion("7.0.0.0")]
+[assembly: AssemblyFileVersion("7.0.0.0")]
diff --git a/src.ruby/mpxj/lib/mpxj/version.rb b/src.ruby/mpxj/lib/mpxj/version.rb
index 3dc3d92172..26fee336bd 100644
--- a/src.ruby/mpxj/lib/mpxj/version.rb
+++ b/src.ruby/mpxj/lib/mpxj/version.rb
@@ -1,5 +1,5 @@
 # MPXJ gem module
 module MPXJ
   # MPXJ gem version number
-  VERSION = "6.2.1"
+  VERSION = "7.0.0"
 end