diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index dfe7c81af3..3826e93960 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
 
 The format is based on `Keep a Changelog <http://keepachangelog.com/>`_.
 
+====================
+1.3.6 - 2017-08-10
+====================
+
+Added
+-------
+* Documentation for UploadManager.
+
+Changed
+-------
+* Upgraded cryptography dependency to 1.8.2.
+
 ====================
 1.3.5 - 2017-07-20
 ====================
diff --git a/docs/index.rst b/docs/index.rst
index d62598c5c7..2db71f0310 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -36,6 +36,7 @@ To get started, head over to the :ref:`installation instructions <install>` or s
     forward-compatibility
     quickstart
     parallel-ops
+    upload-manager
     raw-requests
     api/index
     contributions
diff --git a/docs/upload-manager.rst b/docs/upload-manager.rst
new file mode 100644
index 0000000000..438e42502f
--- /dev/null
+++ b/docs/upload-manager.rst
@@ -0,0 +1,8 @@
+.. _upload-manager:
+
+Uploading Large Objects
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+The Object Storage service supports multipart uploads to make large object uploads easier by splitting the large object into parts. The Python SDK supports raw multipart upload operations for advanced use cases, as well as a higher-level upload class that uses the multipart upload APIs. `Managing Multipart Uploads <https://docs.us-phoenix-1.oraclecloud.com/Content/Object/Tasks/managingmultipartuploads.htm>`_ provides links to the APIs used for raw multipart upload operations. Higher-level uploads can be performed using the UploadManager. The UploadManger will: split a large object into parts for you, upload the parts in parallel, and then recombine and commit the parts as a single object in Object Storage.
+
+The `UploadObject <https://github.com/oracle/bmcs-python-sdk/blob/master/examples/multipart_object_upload.py>`_ example shows how UploadManager can be used to upload files to object storage. 
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index d00c0428ea..7b29dc07f1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 certifi
 configparser==3.5.0
 coverage==4.2
-cryptography==1.8.1
+cryptography==1.8.2
 flake8==3.0.4
 httpsig_cffi==15.0.0
 pytest==3.0.2
diff --git a/setup.py b/setup.py
index 43606614a3..ea713340f7 100644
--- a/setup.py
+++ b/setup.py
@@ -31,7 +31,7 @@ def open_relative(*path):
 requires = [
     "certifi",
     "configparser==3.5.0",
-    "cryptography==1.8.1",
+    "cryptography==1.8.2",
     "httpsig_cffi==15.0.0",
     "python-dateutil==2.5.3",
     "pytz==2016.7",
diff --git a/src/oraclebmc/config.py b/src/oraclebmc/config.py
index e84fa7748e..58b23fa9e1 100644
--- a/src/oraclebmc/config.py
+++ b/src/oraclebmc/config.py
@@ -38,7 +38,7 @@
     "additional_user_agent": "",
     "pass_phrase": None
 }
-DEFAULT_LOCATION = '~/.oraclebmc/config'
+DEFAULT_LOCATION = os.path.join('~', '.oraclebmc', 'config')
 DEFAULT_PROFILE = "DEFAULT"
 PATTERNS = {
     # Tenancy and user have the same shape
diff --git a/src/oraclebmc/version.py b/src/oraclebmc/version.py
index 74414e7419..c75f29e72e 100644
--- a/src/oraclebmc/version.py
+++ b/src/oraclebmc/version.py
@@ -1,4 +1,4 @@
 # coding: utf-8
 # Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
 
-__version__ = "1.3.5"
+__version__ = "1.3.6"