diff --git a/src/xivelyjs.js b/src/xivelyjs.js
index a2e7c44..c6afb47 100644
--- a/src/xivelyjs.js
+++ b/src/xivelyjs.js
@@ -440,6 +440,76 @@
         });
       }
     };
+    
+    
+    
+    // ---------------------------------
+    // Devices module
+    //
+    this.devices = {
+      list: function(productid, options, callback) {
+        request({
+          url     : apiEndpoint +"/products/"+ productid +"/devices",
+          data    : options,
+          always  : callback
+        });
+      },
+      
+      activate: function(activationcode, callback) {
+          request({
+            url     : apiEndpoint +"/devices/"+ activationcode +"/activate",
+            always  : callback
+          });
+        },
+
+      create: function(productid, data, callback) {
+        request({
+          type    : "post",
+          url     : apiEndpoint +"/products/" + productid + "/devices",
+          data    : data,
+          always  : callback
+        });
+      },
+      
+      read: function(productid, deviceserial, callback) {
+
+          request({
+            url     : apiEndpoint +"/products/"+ productid +"/devices/" + deviceserial,
+            always  : callback
+          });
+      },
+
+      update: function(productid, deviceserial, data, callback) {
+
+          request({
+            type    : "put",
+            url     : apiEndpoint +"/products/"+ productid +"/devices/" + deviceserial,
+            data	: data,
+            always  : callback
+          });
+      },
+      'delete': function(productid, deviceserial, callback) {
+
+          request({
+            type    : "delete",
+            url     : apiEndpoint +"/products/"+ productid +"/devices/" + deviceserial,
+            always  : callback
+          });
+      }
+
+
+    };
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
 
     this._settings = function() {
       return {
diff --git a/xivelyjs-1.0.4.js b/xivelyjs-1.0.4.js
index 002f56c..97d6d2a 100644
--- a/xivelyjs-1.0.4.js
+++ b/xivelyjs-1.0.4.js
@@ -363,6 +363,54 @@
                 });
             }
         };
+        // ---------------------------------
+        // Devices module
+        //
+        this.devices = {
+          list: function(productid, options, callback) {
+            request({
+              url     : apiEndpoint +"/products/"+ productid +"/devices",
+              data    : options,
+              always  : callback
+            });
+          },
+          activate: function(activationcode, callback) {
+              request({
+                url     : apiEndpoint +"/devices/"+ activationcode +"/activate",
+                always  : callback
+              });
+            },
+          create: function(productid, data, callback) {
+            request({
+              type    : "post",
+              url     : apiEndpoint +"/products/" + productid + "/devices",
+              data    : data,
+              always  : callback
+            });
+          },
+          read: function(productid, deviceserial, callback) {
+              request({
+                url     : apiEndpoint +"/products/"+ productid +"/devices/" + deviceserial,
+                always  : callback
+              });
+          },
+          update: function(productid, deviceserial, data, callback) {
+              request({
+            	type	: "put",
+                url     : apiEndpoint +"/products/"+ productid +"/devices/" + deviceserial,
+                data	: data,
+                always  : callback
+              });
+          },
+          'delete': function(productid, deviceserial, callback) {
+
+              request({
+            	type	: "delete",
+                url     : apiEndpoint +"/products/"+ productid +"/devices/" + deviceserial,
+                always  : callback
+              });
+          }
+        };
         this._settings = function() {
             return {
                 apiKey: apiKey,