diff --git a/Tests/CouchTest.cs b/Tests/CouchTest.cs
index 71cb606..e6c313a 100644
--- a/Tests/CouchTest.cs
+++ b/Tests/CouchTest.cs
@@ -205,7 +205,7 @@ public void ShouldSaveDocumentWithoutId()
 
         private class LittleCar
         {
-            public string Id, Rev;
+            public string _id, _rev;
             public string Make, Model, docType;
         }
 
@@ -214,7 +214,7 @@ public void ShouldSaveArbitraryDocument()
         {
             var littleCar = new LittleCar() { docType = "car", Make = "Yugo", Model = "Hell if i know" };
             littleCar = db.SaveArbitraryDocument(littleCar);
-            Assert.IsNotNull(littleCar.Id);
+            Assert.IsNotNull(littleCar._id);
         }
 
         [Test]
@@ -222,9 +222,9 @@ public void ShouldLoadArbitraryDocument()
         {
             var firstCar = new LittleCar() { docType = "car", Make = "Yugo", Model = "Hell if i know" };
             firstCar = db.SaveArbitraryDocument(firstCar);
-            var otherCar = db.GetArbitraryDocument<LittleCar>(firstCar.Id, () => new LittleCar());
+            var otherCar = db.GetArbitraryDocument<LittleCar>(firstCar._id, () => new LittleCar());
             Assert.IsNotNull(otherCar);
-            Assert.IsNotNull(otherCar.Id);
+            Assert.IsNotNull(otherCar._id);
         }
 
         [Test]
diff --git a/Tests/Divan.Test.csproj b/Tests/Divan.Test.csproj
index 2e54dae..c7cd771 100644
--- a/Tests/Divan.Test.csproj
+++ b/Tests/Divan.Test.csproj
@@ -76,9 +76,6 @@
       <Name>Divan</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/CouchDatabase.cs b/src/CouchDatabase.cs
index d699c3a..63b7f74 100644
--- a/src/CouchDatabase.cs
+++ b/src/CouchDatabase.cs
@@ -227,7 +227,7 @@ public ICouchDocument SaveDocument(ICouchDocument document)
 				else 
 	                savedDoc = WriteDocument(document);
             }
-            catch (CouchConflictException ex)
+            catch (CouchConflictException)
             {
                 if (reconcilingDoc == null)
                     throw;
diff --git a/src/CouchRequest.cs b/src/CouchRequest.cs
index d4ebfb1..cff19b0 100644
--- a/src/CouchRequest.cs
+++ b/src/CouchRequest.cs
@@ -27,7 +27,6 @@ public class CouchRequest
         public string method = "GET"; // PUT, DELETE, POST, HEAD
         public string mimeType;
         public string path;
-        //public byte[] postData;        
         public string query;
 
         public JToken result;
@@ -134,22 +133,18 @@ public CouchRequest Delete()
 
         public CouchRequest Data(string data)
         {
-            var postData = Encoding.UTF8.GetBytes(data);
-            return Data(postData);
-            //this.postStream = new MemoryStream(postData);
-            //return this;
+            return Data(Encoding.UTF8.GetBytes(data));
         }
 
         public CouchRequest Data(byte[] data)
         {
-            this.postStream = new MemoryStream(data);
-            //postData = data;
+            postStream = new MemoryStream(data);
             return this;
         }
 
         public CouchRequest Data(Stream dataStream)
         {
-            this.postStream = dataStream;
+            postStream = dataStream;
             return this;
         }
 
@@ -202,7 +197,7 @@ public CouchRequest Check(string message)
 
         private HttpWebRequest GetRequest()
         {
-            Uri requestUri = new UriBuilder("http", server.Host, server.Port, ((db != null) ? db.Name + "/" : "") + path, query).Uri;
+            var requestUri = new UriBuilder("http", server.Host, server.Port, ((db != null) ? db.Name + "/" : "") + path, query).Uri;
             var request = WebRequest.Create(requestUri) as HttpWebRequest;
             if (request == null)
             {
@@ -221,6 +216,11 @@ private HttpWebRequest GetRequest()
                 request.Headers.Add(header.Key, header.Value);
             }
 
+            if (!string.IsNullOrEmpty(server.EncodedCredentials))
+			{
+                request.Headers.Add("Authorization", server.EncodedCredentials);
+			}
+			
             if (postStream != null)
             {
                 WriteData(request);
diff --git a/src/CouchServer.cs b/src/CouchServer.cs
index 611a5d1..5d7c46c 100644
--- a/src/CouchServer.cs
+++ b/src/CouchServer.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Net;
+using System.Text;
 using System.Text.RegularExpressions;
 using Newtonsoft.Json;
 
@@ -25,16 +26,30 @@ public class CouchServer
         public readonly string Host;
         public readonly int Port;
 
+        public readonly string UserName;
+        public readonly string Password;
+        public readonly string EncodedCredentials;
+
         public string DatabasePrefix = ""; // Used by databases to prefix their names
 
-        public CouchServer(string host, int port)
+        public CouchServer(string host, int port, string user, string pass)
         {
             Host = host;
             Port = port;
+            UserName = user;
+            Password = pass;
+
+            if (!String.IsNullOrEmpty(UserName))
+                EncodedCredentials = "Basic " +
+                                     Convert.ToBase64String(Encoding.ASCII.GetBytes(UserName + ":" + Password));
 
             Debug(string.Format("CouchServer({0}:{1})", host, port));
         }
 
+        public CouchServer(string host, int port): this(host, port, null, null)
+        {
+        }
+
         public CouchServer(string host)
             : this(host, DefaultPort)
         {