diff --git a/README.rdoc b/README.rdoc
index d74143f..899adcd 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -39,11 +39,9 @@ in any mono release after 2.4.2.3 (I guess). Then we will remove that check.
 
 == What about documentation?
 At the moment documentation is... this file! :) But there are also unit tests in the separate Tests project:
-* CouchTest.cs that runs against a CouchDB server.
+* CouchTest.cs that runs against a CouchDB server, see the class comment for some instructions.
 * Lucene/CouchLuceneTest.cs that tests the CouchDB-Lucene integration if you have it, see article below.
 
-When running the tests they will expect CouchDB running at localhost:5984, unless you copy the App.config.template to App.config and edit it.
-
 There is also one sample project "Trivial" showing basic usage. More samples with more advanced usage is coming soon.
 
 * One blog article[http://goran.krampe.se/blog/Divan/divan-plus-couchdb-lucene.rdoc] on how to install Couchdb-Lucene and test it with Divan.
@@ -68,4 +66,4 @@ Apart from polishing and fixing bugs the following pieces are on the todolist:
 * Writing a tutorial and a sample project showing the advanced mechanisms.
 
 == Contributing
-...is simple. <b>All contributions should be under the MIT license</b>. Just fork and make pull requests and we will try to integrate. Feel free to bring up anything on the mailinglist. We haven't started using any issue tracker yet, but we will if it gets more popular and we when we do a proper release.
\ No newline at end of file
+...is simple. <b>All contributions should be under the MIT license</b>. Just fork and make pull requests and we will try to integrate. Feel free to bring up anything on the mailinglist. We haven't started using any issue tracker yet, but we will if it gets more popular and we when we do a proper release.
diff --git a/Tests/CouchTest.cs b/Tests/CouchTest.cs
index 228026a..4c64449 100644
--- a/Tests/CouchTest.cs
+++ b/Tests/CouchTest.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Configuration;
 using System.Linq;
+using System.IO;
 using System.Text.RegularExpressions;
 using Newtonsoft.Json.Linq;
 using NUnit.Framework;
@@ -11,8 +12,12 @@ namespace Divan.Test
 {
     /// <summary>
     /// Unit tests for Divan. Operates in a separate CouchDB database called divan_unit_tests.
-    /// If you are not running a CouchDB on localhost:5984 you will need to edit
-    /// the Tests/App.config file.
+    /// If you are not running a CouchDB on localhost:5984 you will need to first edit
+    /// the Tests/App.config file to point somewhere else.
+    /// 
+    /// NOTE: App.config is copied to Tests/bin/Debug/Divan.Test.dll.config as a
+    /// Custom Command in the Makefile! if someone can tell me how to handle this better on
+    /// Mono/Monodevelop I am all ears.
     /// 
     /// Run from command line using something like:
     /// 	nunit-console2 --labels -run=Divan.Test.CouchTest Tests/bin/Debug/Tests.dll
@@ -202,15 +207,33 @@ public void ShouldStoreGetAndDeleteAttachment()
         {
             var doc = new CouchJsonDocument("{\"CPU\": \"Intel\"}");
             ICouchDocument cd = db.CreateDocument(doc);
-            Assert.That(db.HasAttachment(cd), Is.False);
-            db.WriteAttachment(cd, "jabbadabba", "text/plain");
-            Assert.That(db.HasAttachment(cd), Is.True);
-            Assert.That(db.ReadAttachment(cd), Is.EqualTo("jabbadabba"));
-            db.WriteAttachment(cd, "jabbadabba-doo", "text/plain");
-            Assert.That(db.HasAttachment(cd), Is.True);
-            Assert.That(db.ReadAttachment(cd), Is.EqualTo("jabbadabba-doo"));
-            db.DeleteAttachment(cd);
-            Assert.That(db.HasAttachment(cd), Is.False);
+            var attachmentName = "someAttachment.txt";
+            Assert.That(db.HasAttachment(cd,attachmentName), Is.False);
+            db.WriteAttachment(cd, attachmentName, "jabbadabba", "text/plain");
+            Assert.That(db.HasAttachment(cd,attachmentName), Is.True);
+
+            using (var response = db.ReadAttachment(cd, attachmentName))
+            {
+                using (var reader = new StreamReader(response.GetResponseStream()))
+                {
+                    Assert.That(reader.ReadToEnd(), Is.EqualTo("jabbadabba"));
+                }
+            }
+
+            db.WriteAttachment(cd, attachmentName, "jabbadabba-doo", "text/plain");
+            Assert.That(db.HasAttachment(cd,attachmentName), Is.True);
+
+            using (var response = db.ReadAttachment(cd, attachmentName))
+            {
+                using (var reader = new StreamReader(response.GetResponseStream()))
+                {
+                    Assert.That(reader.ReadToEnd(), Is.EqualTo("jabbadabba-doo"));
+                }
+            }
+
+            db.DeleteAttachment(cd,attachmentName);
+
+            Assert.That(db.HasAttachment(cd,attachmentName), Is.False);
         }
 
         [Test, ExpectedException(typeof (CouchConflictException))]
diff --git a/Tests/Divan.Test.csproj b/Tests/Divan.Test.csproj
index 96045da..1b55939 100644
--- a/Tests/Divan.Test.csproj
+++ b/Tests/Divan.Test.csproj
@@ -57,6 +57,7 @@
     </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
+    <Reference Include="System.Web" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CouchTest.cs" />
@@ -69,9 +70,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/Tests/Makefile b/Tests/Makefile
index 5bbb879..09f624c 100644
--- a/Tests/Makefile
+++ b/Tests/Makefile
@@ -89,6 +89,7 @@ REFERENCES =  \
 	System.Core \
 	System.Data \
 	System.Data.DataSetExtensions \
+	System.Web \
 	System.Xml \
 	System.Xml.Linq
 
diff --git a/src/CouchDatabase.cs b/src/CouchDatabase.cs
index 226e553..2672b42 100644
--- a/src/CouchDatabase.cs
+++ b/src/CouchDatabase.cs
@@ -2,9 +2,10 @@
 using System.Globalization;
 using System.Linq;
 using System.Net;
+using System.Text;
+using System;
 using Divan.Lucene;
 using Newtonsoft.Json.Linq;
-using System;
 
 namespace Divan
 {
@@ -61,17 +62,17 @@ public CouchDesignDocument NewDesignDocument(string aName)
             return newDoc;
         }
 
-		/// <summary>
-		/// Only to be used when developing.
-		/// </summary>
-		public CouchViewDefinition NewTempView(string designDoc, string viewName, string mapText)
+        /// <summary>
+        /// Only to be used when developing.
+        /// </summary>
+        public CouchViewDefinition NewTempView(string designDoc, string viewName, string mapText)
         {
             var doc = NewDesignDocument(designDoc);
             var view = doc.AddView(viewName, "function (doc) {" + mapText + "}");
             doc.Synch();
             return view;
         }
-				
+
         /// <summary>
         /// Currently the logic is that the code is always the master.
         /// And we also do not remove design documents in the database that
@@ -210,13 +211,13 @@ public T SaveArbitraryDocument<T>(T document)
         /// <summary>
         /// This is a convenience method that creates or writes a ICouchDocument depending on if
         /// it has an id or not. If it does not have an id we create the document and let CouchDB allocate
-        /// an id. If it has an id we use WriteDocument which will overwrite the document in CouchDB.
+        /// an id. If it has an id we use WriteDocument which will overwrite the existing document in CouchDB.
         /// </summary>
-        /// <param name="document">Couch document</param>
-        /// <returns>Couch Document with new Rev set and possibly an Id set.</returns>
+        /// <param name="document">ICouchDocument</param>
+        /// <returns>ICouchDocument with new Rev set.</returns>
         public ICouchDocument SaveDocument(ICouchDocument document)
         {
-            if (document.Id == null || document.Rev == null)
+            if (document.Id == null)
             {
                 return CreateDocument(document);
             }
@@ -249,11 +250,27 @@ public ICouchDocument WriteDocument(ICouchDocument document, bool batch)
         /// Add an attachment to an existing ICouchDocument, it may already exist in db and will then be overwritten.
         /// </summary>
         /// <param name="document">Couch document</param>
-        /// <param name="attachment">Binary data as string</param>
+        /// <param name="attachmentName">Name of the attachment.</param>
+        /// <param name="attachmentData">The attachment data.</param>
+        /// <param name="mimeType">The MIME type for the attachment.</param>
+        /// <returns>The document.</returns>
+        /// <remarks>This relies on the document to already have an id.</remarks>
+        public ICouchDocument WriteAttachment(ICouchDocument document, string attachmentName, string attachmentData, string mimeType)
+        {
+            var byteData = Encoding.UTF8.GetBytes(attachmentData);
+            return WriteAttachment(document, attachmentName, byteData, mimeType);
+        }
+
+        /// <summary>
+        /// Add an attachment to an existing ICouchDocument, it may already exist in db and will then be overwritten.
+        /// </summary>
+        /// <param name="document">Couch document</param>
+        /// <param name="attachmentName">Name of the attachment.</param>
+        /// <param name="attachmentData">The attachment data.</param>
         /// <param name="mimeType">The MIME type for the attachment.</param>
         /// <returns>The document.</returns>
         /// <remarks>This relies on the document to already have an id.</remarks>
-        public ICouchDocument WriteAttachment(ICouchDocument document, string attachment, string mimeType)
+        public ICouchDocument WriteAttachment(ICouchDocument document, string attachmentName, byte[] attachmentData, string mimeType)
         {
             if (document.Id == null)
             {
@@ -262,7 +279,7 @@ public ICouchDocument WriteAttachment(ICouchDocument document, string attachment
             }
 
             JObject result =
-                Request(document.Id + "/attachment").Query("?rev=" + document.Rev).Data(attachment).MimeType(mimeType).Put().Check("Failed to write attachment")
+                Request(document.Id + "/" + attachmentName).Query("?rev=" + document.Rev).Data(attachmentData).MimeType(mimeType).Put().Check("Failed to write attachment")
                     .Result();
             document.Id = result["id"].Value<string>(); // Not really neeed
             document.Rev = result["rev"].Value<string>();
@@ -283,9 +300,11 @@ public void ReadDocument(ICouchDocument document)
         /// Read the attachment for an ICouchDocument.
         /// </summary>
         /// <param name="document">Document to read.</param>
-        public string ReadAttachment(ICouchDocument document)
+        /// <param name="attachmentName">Name of the attachment.</param>
+        /// <returns></returns>
+        public WebResponse ReadAttachment(ICouchDocument document, string attachmentName)
         {
-            return ReadAttachment(document.Id);
+            return ReadAttachment(document.Id, attachmentName);
         }
 
         /// <summary>
@@ -354,11 +373,11 @@ public string ReadDocumentString(string documentId)
         /// </summary>
         /// <param name="documentId">Document identifier</param>
         /// <returns>Document attachment</returns>
-        public string ReadAttachment(string documentId)
+        public WebResponse ReadAttachment(string documentId, string attachmentName)
         {
             try
             {
-                return Request(documentId + "/attachment").String();
+                return Request(documentId + "/" + attachmentName).Response();
             }
             catch (WebException e)
             {
@@ -374,7 +393,7 @@ public string ReadAttachment(string documentId)
         /// <remarks>POST which may be problematic in some environments.</remarks>
         public CouchJsonDocument CreateDocument(string json)
         {
-            return (CouchJsonDocument) CreateDocument(new CouchJsonDocument(json));
+            return (CouchJsonDocument)CreateDocument(new CouchJsonDocument(json));
         }
 
         /// <summary>
@@ -543,7 +562,7 @@ public IList<CouchJsonDocument> GetDocuments(string[] documentIds)
 
         public T GetDocument<T>(string documentId) where T : ICouchDocument, new()
         {
-            var doc = new T {Id = documentId};
+            var doc = new T { Id = documentId };
             try
             {
                 ReadDocument(doc);
@@ -629,9 +648,9 @@ public void DeleteDocument(ICouchDocument document)
             DeleteDocument(document.Id, document.Rev);
         }
 
-        public ICouchDocument DeleteAttachment(ICouchDocument document)
+        public ICouchDocument DeleteAttachment(ICouchDocument document, string attachmentName)
         {
-            JObject result = Request(document.Id + "/attachment").Query("?rev=" + document.Rev).Delete().Check("Failed to delete attachment").Result();
+            JObject result = Request(document.Id + "/" + attachmentName).Query("?rev=" + document.Rev).Delete().Check("Failed to delete attachment").Result();
             document.Id = result["id"].Value<string>(); // Not really neeed
             document.Rev = result["rev"].Value<string>();
             return document;
@@ -707,9 +726,9 @@ public bool HasDocument(ICouchDocument document)
             return HasDocument(document.Id);
         }
 
-        public bool HasAttachment(ICouchDocument document)
+        public bool HasAttachment(ICouchDocument document, string attachmentName)
         {
-            return HasAttachment(document.Id);
+            return HasAttachment(document.Id, attachmentName);
         }
 
         public bool HasDocumentChanged(ICouchDocument document)
@@ -735,11 +754,11 @@ public bool HasDocument(string documentId)
             }
         }
 
-        public bool HasAttachment(string documentId)
+        public bool HasAttachment(string documentId, string attachmentName)
         {
             try
             {
-                Request(documentId + "/attachment").Head().Send();
+                Request(documentId + "/" + attachmentName).Head().Send();
                 return true;
             }
             catch (WebException)
diff --git a/src/CouchDocumentWrapper.cs b/src/CouchDocumentWrapper.cs
index 40a3b5e..ae676c9 100644
--- a/src/CouchDocumentWrapper.cs
+++ b/src/CouchDocumentWrapper.cs
@@ -127,13 +127,13 @@ public string Id
 
         public void WriteJson(Newtonsoft.Json.JsonWriter writer)
         {
-            if (Id == null || Rev == null)
+            if (Id == null)
             {
                 var tokenWriter = new JTokenWriter();
                 serializer.Serialize(tokenWriter, instance);
                 var obj = tokenWriter.Token as JObject;
-                if (Rev == null) obj.Remove("_rev");
-                if(Id == null) obj.Remove("_id");                
+                obj.Remove("_rev");
+                obj.Remove("_id");                
                 obj.WriteTo(writer);
             } else
                 serializer.Serialize(writer, instance);
@@ -142,10 +142,8 @@ public void WriteJson(Newtonsoft.Json.JsonWriter writer)
         public void ReadJson(Newtonsoft.Json.Linq.JObject obj)
         {
             instance = (T)serializer.Deserialize(new JTokenReader(obj), typeof(T));
-            if(obj["_id"] != null)
-                id.SetValue(instance, obj["_id"].Value<string>());
-            if(obj["_rev"] != null)
-                rev.SetValue(instance, obj["_rev"].Value<string>());
+            id.SetValue(instance, obj["_id"].Value<string>());
+            rev.SetValue(instance, obj["_rev"].Value<string>());
         }
 
         #endregion
diff --git a/src/CouchRequest.cs b/src/CouchRequest.cs
index f0b1de8..f4281db 100644
--- a/src/CouchRequest.cs
+++ b/src/CouchRequest.cs
@@ -25,7 +25,7 @@ public class CouchRequest
         public string method = "GET"; // PUT, DELETE, POST, HEAD
         public string mimeType;
         public string path;
-        public string postData;
+        public byte[] postData;
         public string query;
 
         public JToken result;
@@ -125,6 +125,12 @@ public CouchRequest Delete()
         }
 
         public CouchRequest Data(string data)
+        {
+            postData = Encoding.UTF8.GetBytes(data);
+            return this;
+        }
+
+        public CouchRequest Data(byte[] data)
         {
             postData = data;
             return this;
@@ -144,12 +150,12 @@ public CouchRequest MimeTypeJson()
 
         public JObject Result()
         {
-            return (JObject) result;
+            return (JObject)result;
         }
 
         public T Result<T>() where T : JToken
         {
-            return (T) result;
+            return (T)result;
         }
 
         public string Etag()
@@ -195,11 +201,11 @@ private HttpWebRequest GetRequest()
 
             if (postData != null)
             {
-                byte[] bytes = Encoding.UTF8.GetBytes(postData);
-                request.ContentLength = bytes.Length;
+                //byte[] bytes = Encoding.UTF8.GetBytes(postData);
+                request.ContentLength = postData.Length;
                 using (Stream ps = request.GetRequestStream())
                 {
-                    ps.Write(bytes, 0, bytes.Length);
+                    ps.Write(postData, 0, postData.Length);
                     ps.Close();
                 }
             }
@@ -240,7 +246,7 @@ public T Parse<T>() where T : JToken
             }
             //timer.Stop();
             //Trace.WriteLine("Time for Couch HTTP & JSON PARSE: " + timer.ElapsedMilliseconds);
-            return (T) result;
+            return (T)result;
         }
 
         private void PickETag(WebResponse response)
@@ -274,6 +280,21 @@ public string String()
             }
         }
 
+        public WebResponse Response()
+        {
+            WebResponse response = GetResponse();
+
+            PickETag(response);
+            if (etagToCheck != null)
+            {
+                if (IsETagValid())
+                {
+                    return null;
+                }
+            }
+            return response;
+        }
+
         private WebResponse GetResponse()
         {
             return GetRequest().GetResponse();