diff --git a/src/Mandrill.net/MandrillExportsApi.cs b/src/Mandrill.net/MandrillExportsApi.cs
index d1ed4db..a24a0fd 100644
--- a/src/Mandrill.net/MandrillExportsApi.cs
+++ b/src/Mandrill.net/MandrillExportsApi.cs
@@ -16,40 +16,40 @@ public MandrillExportsApi(MandrillApi mandrillApi)
         }
         public MandrillApi MandrillApi { get; set; }
 
-        public async Task<IList<MandrillExportInfo>> ListAsync()
+        public Task<IList<MandrillExportInfo>> ListAsync()
         {
-            return await MandrillApi.PostAsync<MandrillExportRequest, IList<MandrillExportInfo>>("exports/list.json",
+            return MandrillApi.PostAsync<MandrillExportRequest, IList<MandrillExportInfo>>("exports/list.json",
                 new MandrillExportRequest());
         }
 
-        public async Task<MandrillExportInfo> InfoAsync(string id)
+        public Task<MandrillExportInfo> InfoAsync(string id)
         {
-            return await MandrillApi.PostAsync<MandrillExportRequest, MandrillExportInfo>("exports/info.json",
+            return MandrillApi.PostAsync<MandrillExportRequest, MandrillExportInfo>("exports/info.json",
                 new MandrillExportRequest
                 {
                     Id = id
                 });
         }
 
-        public async Task<MandrillExportInfo> RejectsAsync(string notifyEmail)
+        public Task<MandrillExportInfo> RejectsAsync(string notifyEmail)
         {
-            return await MandrillApi.PostAsync<MandrillExportRequest, MandrillExportInfo>("exports/rejects.json",
+            return MandrillApi.PostAsync<MandrillExportRequest, MandrillExportInfo>("exports/rejects.json",
                 new MandrillExportRequest
                 {
                     NotifyEmail = notifyEmail
                 });
         }
 
-        public async Task<MandrillExportInfo> WhitelistAsync(string notifyEmail)
+        public Task<MandrillExportInfo> WhitelistAsync(string notifyEmail)
         {
-            return await MandrillApi.PostAsync<MandrillExportRequest, MandrillExportInfo>("exports/whitelist.json",
+            return MandrillApi.PostAsync<MandrillExportRequest, MandrillExportInfo>("exports/whitelist.json",
                 new MandrillExportRequest
                 {
                     NotifyEmail = notifyEmail
                 });
         }
 
-        public async Task<MandrillExportInfo> ActivityAsync(string notifyEmail,
+        public Task<MandrillExportInfo> ActivityAsync(string notifyEmail,
             DateTime? dateFrom = null, 
             DateTime? dateTo = null,
             IList<string> tags = null, 
@@ -57,7 +57,7 @@ public async Task<MandrillExportInfo> ActivityAsync(string notifyEmail,
             IList<string> states = null,
             IList<string> apiKeys = null)
         {
-            return await MandrillApi.PostAsync<MandrillExportRequest, MandrillExportInfo>("exports/activity",
+            return MandrillApi.PostAsync<MandrillExportRequest, MandrillExportInfo>("exports/activity",
                 new MandrillExportRequest
                 {   
                     NotifyEmail = notifyEmail,
diff --git a/src/Mandrill.net/MandrillRequest.cs b/src/Mandrill.net/MandrillRequest.cs
index c034141..fd651c5 100644
--- a/src/Mandrill.net/MandrillRequest.cs
+++ b/src/Mandrill.net/MandrillRequest.cs
@@ -82,17 +82,18 @@ public override async Task<TResponse> PostAsync<TRequest, TResponse>(string requ
                 MandrillSerializer<TRequest>.Serialize(jsonWriter, value);
                 jsonWriter.Flush();
                 inputStream.Seek(0, SeekOrigin.Begin);
-                using (var requestStream = await request.GetRequestStreamAsync())
+                using (var requestStream = await request.GetRequestStreamAsync().ConfigureAwait(false))
                 {
-                    await inputStream.CopyToAsync(requestStream);
+                    await inputStream.CopyToAsync(requestStream).ConfigureAwait(false);
                 }
             }
 
             try
             {
-                using (var response = (HttpWebResponse) await request.GetResponseAsync())
+                using (var response = (HttpWebResponse) await request.GetResponseAsync().ConfigureAwait(false))
                 using (var responseStream = response.GetResponseStream())
-                using (var jsonReader = new JsonTextReader(new StreamReader(responseStream)))
+                using(var responseReader = new StreamReader(responseStream))
+                using (var jsonReader = new JsonTextReader(responseReader))
                 {
                     return MandrillSerializer<TResponse>.Deserialize(jsonReader);
                 }
@@ -113,7 +114,8 @@ private static MandrillException ExtractMandrillErrorResponse(string requestUri,
                 {
                     using (var response = webResponse)
                     using (var responseStream = response.GetResponseStream())
-                    using (var jsonReader = new JsonTextReader(new StreamReader(responseStream)))
+                    using (var responseReader = new StreamReader(responseStream))
+                    using (var jsonReader = new JsonTextReader(responseReader))
                     {
                         error = MandrillSerializer<MandrillErrorResponse>.Deserialize(jsonReader);
                     }
diff --git a/src/Mandrill.net/MandrillUsersApi.cs b/src/Mandrill.net/MandrillUsersApi.cs
index 6158662..3ee86d5 100644
--- a/src/Mandrill.net/MandrillUsersApi.cs
+++ b/src/Mandrill.net/MandrillUsersApi.cs
@@ -17,7 +17,7 @@ public MandrillUsersApi(MandrillApi mandrillApi)
         public async Task<string> PingAsync()
         {
             return (await MandrillApi.PostAsync<MandrillUsersRequest, JObject>("users/ping2.json",
-                new MandrillUsersRequest()))["PING"].Value<string>();
+                new MandrillUsersRequest()).ConfigureAwait(false))["PING"].Value<string>();
         }
 
         public Task<IList<MandrillSenderDemographics>> SendersAsync()