diff --git a/ChangeLog b/ChangeLog
index 4e92770f46282afcd9d57c9c3ab1480e4401b611..a7626606d244fc81763dbc47cf96d747e4044ae2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2014-09-16, v0.7rc3
+2014-09-26, v0.7
 	* Support all QEMU supported disk image formats as input media
 	* Detect if a Windows input media is sysprepped
 	* Support VirtIO driver installation in Windows
diff --git a/docs/man/snf-image-creator.rst b/docs/man/snf-image-creator.rst
index cd1704c6daa7bb624c3d7982e947df996bccb3fd..38118dc9232ee566a355918ad00da20e5f8c8d7f 100644
--- a/docs/man/snf-image-creator.rst
+++ b/docs/man/snf-image-creator.rst
@@ -23,5 +23,8 @@ Options
 	show this help message and exit
 -l FILE, --logfile=FILE
 	log all messages to FILE
+--no-snapshot
+	don't snapshot the input media. (THIS IS DANGEROUS AS IT WILL ALTER THE
+	ORIGINAL MEDIA!!!)
 --tmpdir=DIR
 	create large temporary image files under DIR
diff --git a/docs/man/snf-mkimage.rst b/docs/man/snf-mkimage.rst
index 3d7e6cfd39e95945fbb721692f857126a2d60f36..e622ae92da7099b741891a7e7e6fcb26742bb2bf 100644
--- a/docs/man/snf-mkimage.rst
+++ b/docs/man/snf-mkimage.rst
@@ -44,6 +44,9 @@ Options
 --no-shrink
 	don't shrink any partition
 
+--no-snapshot
+	don't snapshot the input media. (THIS IS DANGEROUS AS IT WILL ALTER THE
+	ORIGINAL MEDIA!!!)
 --no-sysprep
 	don't perform any system preparation operation
 
diff --git a/image_creator/bundle_volume.py b/image_creator/bundle_volume.py
index 51b7fd14529991a94d51be88b7d1f2bb3a170d88..b39760c953c6904449d3e39af89d4feb7faf6b29 100644
--- a/image_creator/bundle_volume.py
+++ b/image_creator/bundle_volume.py
@@ -177,8 +177,6 @@ class BundleVolume(object):
         shrink the partition before that. Make sure it can still host all the
         files the corresponding host file system hosts
         """
-        new_end = self.disk.device.length
-
         image_disk = parted.Disk(parted.Device(image))
 
         is_extended = lambda p: p.type == parted.PARTITION_EXTENDED
@@ -187,6 +185,7 @@ class BundleVolume(object):
         partitions = self._get_partitions(self.disk)
 
         last = partitions[-1]
+        new_end = last.end
         if last.fs == 'linux-swap(v1)':
             MB = 2 ** 20
             size = (last.end - last.start + 1) * self.disk.device.sectorSize
diff --git a/image_creator/version.py b/image_creator/version.py
index 552e971299e384d19e57f72c4febd0bd246ce160..936075f601fcf5f6df90bee2cf3cdc5f7f0d2a1f 100644
--- a/image_creator/version.py
+++ b/image_creator/version.py
@@ -1,8 +1,8 @@
 
-__version__ = "0.7rc3"
+__version__ = "0.7"
 __version_vcs_info__ = {
-    'branch': 'release-0.7',
-    'revid': 'd595255',
-    'revno': 566}
+    'branch': 'master',
+    'revid': 'ab4d13b',
+    'revno': 571}
 __version_user_email__ = "skalkoto@grnet.gr"
 __version_user_name__ = "Nikos Skalkotos"
diff --git a/version b/version
index c4a3727fb19b9ddf687bdd364194aa7576ac3dbc..eb49d7c7fdcbb1b4745de39837864aa7f78570ac 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.7rc3
+0.7