diff --git a/README.md b/README.md
index 83ae7f19..2420e914 100644
--- a/README.md
+++ b/README.md
@@ -401,7 +401,7 @@ Attahcment object consists of the following properties:
   * **fileName** - filename to be reported as the name of the attached file, use of unicode is allowed (except when using Amazon SES which doesn't like it)
   * **cid** - optional content id for using inline images in HTML message source
   * **contents** - String or a Buffer contents for the attachment
-  * **filePath** - path to a file if you want to stream the file instead of including it (better for larger attachments)
+  * **filePath** - path to a file or an URL if you want to stream the file instead of including it (better for larger attachments)
   * **streamSource** - Stream object for arbitrary binary streams if you want to stream the contents (needs to support *pause*/*resume*)
   * **contentType** - optional content type for the attachment, if not set will be derived from the `fileName` property
   * **contentDisposition** - optional content disposition type for the attachment, defaults to "attachment" 
@@ -414,26 +414,33 @@ Attachments can be added as many as you want.
     var mailOptions = {
         ...
         attachments: [
-            {
+            {   // utf-8 string as an attachment
                 fileName: "text1.txt",
                 contents: "hello world!
             },
-            {
+            {   // binary buffer as an attachment
                 fileName: "text2.txt",
                 contents: new Buffer("hello world!,"utf-8")
             },
-            {
+            {   // file on disk as an attachment
                 fileName: "text3.txt",
                 filePath: "/path/to/file.txt" // stream this file
             },
-            {
+            {   // fileName and content type is derived from filePath
+                filePath: "/path/to/file.txt"
+            },
+            {   // stream as an attachment
                 fileName: "text4.txt",
                 streamSource: fs.createReadStream("file.txt")
             },
-            {
-                fileName: "text",
+            {   // define custom content type for the attachment
+                fileName: "text.bin",
                 contents: "hello world!,
                 contentType: "text/plain"
+            },
+            {   // use URL as an attachment
+                fileName: "license.txt",
+                contents: "https://raw.github.com/andris9/Nodemailer/master/LICENSE"
             }
         ]
     }
diff --git a/lib/nodemailer.js b/lib/nodemailer.js
index 604d7d49..4e0217ed 100644
--- a/lib/nodemailer.js
+++ b/lib/nodemailer.js
@@ -275,6 +275,7 @@ Nodemailer.prototype.setAttachments = function(){
     var attachment;
     for(var i=0, len=this.options.attachments.length; i<len; i++){
         attachment = this.options.attachments[i];
+        attachment.userAgent = attachment.userAgent || this.generateUserAgentString();
         this.mailcomposer.addAttachment(attachment);
     }
 };
\ No newline at end of file
diff --git a/package.json b/package.json
index d12d0ee5..886eb251 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "nodemailer",
     "description": "Easy to use module to send e-mails, supports unicode and SSL/TLS",
-    "version": "0.3.17",
+    "version": "0.3.18",
     "author" : "Andris Reinman",
     "maintainers":[
         {
@@ -25,7 +25,7 @@
         }
     ],
     "dependencies": {
-        "mailcomposer": ">= 0.1.11",
+        "mailcomposer": ">= 0.1.14",
         "simplesmtp": ">= 0.1.15"
     },
     "devDependencies": {