diff --git a/nodes/core/social/27-twitter.html b/nodes/core/social/27-twitter.html
index 2771a2929..704ef0b57 100644
--- a/nodes/core/social/27-twitter.html
+++ b/nodes/core/social/27-twitter.html
@@ -199,6 +199,8 @@
 
 <script type="text/x-red" data-help-name="twitter out">
     <p>Twitter out node. Tweets the <b>msg.payload</b>.</p>
+    <p>If <b>msg.media</b> exists and is a Buffer object, this node will treat it
+       as an image and attach it to the tweet.</p>
 </script>
 
 <script type="text/javascript">
diff --git a/nodes/core/social/27-twitter.js b/nodes/core/social/27-twitter.js
index 708f44bbe..30118edc4 100644
--- a/nodes/core/social/27-twitter.js
+++ b/nodes/core/social/27-twitter.js
@@ -18,7 +18,8 @@ module.exports = function(RED) {
     "use strict";
     var ntwitter = require('twitter-ng');
     var OAuth= require('oauth').OAuth;
-
+    var request = require('request');
+    
     function TwitterNode(n) {
         RED.nodes.createNode(this,n);
         this.screen_name = n.screen_name;
@@ -241,21 +242,54 @@ module.exports = function(RED) {
                 consumer_secret: "meRsltCktVMUI8gmggpXett7WBLd1k0qidYazoML6g",
                 access_token_key: credentials.access_token,
                 access_token_secret: credentials.access_token_secret
-            }).verifyCredentials(function (err, data) {
-                if (err) {
-                    node.error("Error verifying credentials: " + err);
-                } else {
-                    node.on("input", function(msg) {
-                        if (msg != null) {
-                            if (msg.payload.length > 140) {
-                                msg.payload = msg.payload.slice(0,139);
-                                node.warn("Tweet greater than 140 : truncated");
+            });
+            node.on("input", function(msg) {
+                if (msg != null) {
+                    
+                    node.status({fill:"blue",shape:"dot",text:"tweeting"});
+                    
+                    if (msg.payload.length > 140) {
+                        msg.payload = msg.payload.slice(0,139);
+                        node.warn("Tweet greater than 140 : truncated");
+                    }
+                    
+                    if (msg.media && Buffer.isBuffer(msg.media)) {
+                        var apiUrl = "https://api.twitter.com/1.1/statuses/update_with_media.json";
+                        var signedUrl = oa.signUrl(apiUrl,
+                            credentials.access_token,
+                            credentials.access_token_secret,
+                            "POST");
+                        
+                        var r = request.post(signedUrl,function(err,httpResponse,body) {
+                            if (err) {
+                                node.error(err.toString());
+                                node.status({fill:"red",shape:"ring",text:"failed"});
+                            } else {
+                                var response = JSON.parse(body);
+                                if (body.errors) {
+                                    var errorList = body.errors.map(function(er) { return er.code+": "+er.message }).join(", ");
+                                    node.error("tweet failed: "+errorList);
+                                    node.status({fill:"red",shape:"ring",text:"failed"});
+                                } else {
+                                    node.status({});
+                                }
                             }
-                            twit.updateStatus(msg.payload, function (err, data) {
-                                if (err) node.error(err);
-                            });
-                        }
-                    });
+                        });
+                        var form = r.form();
+                        form.append("status",msg.payload);
+                        form.append("media[]",msg.media,{filename:"image"});
+                        
+                        
+                        
+                    } else {
+                        twit.updateStatus(msg.payload, function (err, data) {
+                            if (err) {
+                                node.status({fill:"red",shape:"ring",text:"failed"});
+                                node.error(err);
+                            }
+                            node.status({});
+                        });
+                    }
                 }
             });
         }
diff --git a/package.json b/package.json
index b736bcf8a..78e2e900d 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,8 @@
         "cheerio":"0.15.0",
         "uglify-js":"2.4.13",
         "nodemailer":"1.2.0",
-        "imap":"0.8.13"
+        "imap":"0.8.13",
+        "request":"~2.40.0"
     },
     "devDependencies": {
         "grunt": "0.4.4",