diff --git a/README.md b/README.md
index bda4ee10c..829461600 100644
--- a/README.md
+++ b/README.md
@@ -30,12 +30,14 @@ You can use the `-e` flag to change this socket:
 
 ### Swarm support
 
+**Supported Swarm version: 1.2.3**
+
 You can access a specific view for you Swarm cluster by defining the `-swarm` flag:
 
     # Connect to a tcp socket and enable Swarm:
     $ docker run -d -p 9000:9000 cloudinovasi/cloudinovasi-ui -e http://<SWARM_HOST>:<SWARM_PORT> -swarm
 
-*NOTE*: At the moment, only *Swarm 1.2.0* is supported.
+*NOTE*: Due to Swarm not exposing information in a machine readable way, the app is bound to a specific version of Swarm at the moment.
 
 ### Change address/port UI For Docker is served on
 UI For Docker listens on port 9000 by default. If you run UI For Docker inside a container then you can bind the container's internal port to any external address and port:
diff --git a/app/components/swarm/swarm.html b/app/components/swarm/swarm.html
index ee95f7115..19c621a2b 100644
--- a/app/components/swarm/swarm.html
+++ b/app/components/swarm/swarm.html
@@ -115,6 +115,13 @@
                   <span ng-show="sortType == 'Containers' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
+              <th>
+                <a ui-sref="swarm" ng-click="order('Engine')">
+                  Engine
+                  <span ng-show="sortType == 'Engine' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
+                  <span ng-show="sortType == 'Engine' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
+                </a>
+              </th>
               <th>
                 <a ui-sref="swarm" ng-click="order('Status')">
                   Status
@@ -129,6 +136,7 @@
               <td>{{ node.name }}</td>
               <td>{{ node.ip }}</td>
               <td>{{ node.containers }}</td>
+              <td>{{ node.version }}</td>
               <td><span class="label label-{{ node.status|statusbadge }}">{{ node.status }}</span></td>
             </tr>
           </tbody>
diff --git a/app/components/swarm/swarmController.js b/app/components/swarm/swarmController.js
index 3734383da..a3b096076 100644
--- a/app/components/swarm/swarmController.js
+++ b/app/components/swarm/swarmController.js
@@ -42,7 +42,7 @@ angular.module('swarm', [])
         var node_offset = 4;
         for (i = 0; i < node_count; i++) {
           extractNodeInfo(info, node_offset);
-          node_offset += 9;
+          node_offset += 10;
         }
       }
 
@@ -50,7 +50,8 @@ angular.module('swarm', [])
         var node = {};
         node.name = info[offset][0];
         node.ip = info[offset][1];
-        node.status = info[offset + 1][1];
+        node.id = info[offset + 1][1];
+        node.status = info[offset + 2][1];
         node.containers = info[offset + 2][1];
         node.cpu = info[offset + 3][1];
         node.memory = info[offset + 4][1];