diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 1d034de..2fc98fb 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,13 @@
 Changelog
 =========
 
+.. _v0.10:
+
+0.10 - `master`_
+~~~~~~~~~~~~~~~~
+
+.. note:: This version is not yet released and is under active development.
+
 .. _v0.9:
 
 0.9 - June 18, 2019
diff --git a/kmip/__init__.py b/kmip/__init__.py
index 97748fa..b809374 100644
--- a/kmip/__init__.py
+++ b/kmip/__init__.py
@@ -22,11 +22,17 @@ from kmip.pie import objects
 from kmip.pie.client import ProxyKmipClient as KmipClient
 
 # Dynamically set __version__
-version_path = os.path.join(os.path.dirname(
-    os.path.realpath(__file__)), 'version.py')
-with open(version_path, 'r') as version_file:
-    mo = re.search(r"^.*= '(\d\.\d\..*)'$", version_file.read(), re.MULTILINE)
-    __version__ = mo.group(1)
+version_path = os.path.join(
+    os.path.dirname(os.path.realpath(__file__)),
+    "version.py"
+)
+with open(version_path, 'r') as f:
+    m = re.search(
+        r"^__version__ = \"(\d+\.\d+\..*)\"$",
+        f.read(),
+        re.MULTILINE
+    )
+    __version__ = m.group(1)
 
 
 __all__ = [
diff --git a/kmip/version.py b/kmip/version.py
index 66bfb87..9961683 100644
--- a/kmip/version.py
+++ b/kmip/version.py
@@ -13,4 +13,4 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-__version__ = '0.9.0'
+__version__ = "0.10.dev1"
diff --git a/setup.py b/setup.py
index f6306fb..ceb2cd7 100644
--- a/setup.py
+++ b/setup.py
@@ -18,11 +18,18 @@ import re
 import setuptools
 
 # Dynamically set __version__
-version_path = os.path.join(os.path.dirname(
-    os.path.realpath(__file__)), 'kmip', 'version.py')
-with open(version_path, 'r') as version_file:
-    mo = re.search(r"^.*= '(\d\.\d\..*)'$", version_file.read(), re.MULTILINE)
-    __version__ = mo.group(1)
+version_path = os.path.join(
+    os.path.dirname(os.path.realpath(__file__)),
+    "kmip",
+    "version.py"
+)
+with open(version_path, 'r') as f:
+    m = re.search(
+        r"^__version__ = \"(\d+\.\d+\..*)\"$",
+        f.read(),
+        re.MULTILINE
+    )
+    __version__ = m.group(1)
 
 setuptools.setup(
     name='PyKMIP',