diff --git a/.gitignore b/.gitignore
index 2af6f81..db56709 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 /node_modules
 /dist
 /sauce_connect.log
+/npm-debug.log
 /sc.log
 /test-results
 /tmp
diff --git a/build/grunt/docs.js b/build/grunt/docs.js
index 3ab69c0..2da1aa0 100644
--- a/build/grunt/docs.js
+++ b/build/grunt/docs.js
@@ -262,7 +262,8 @@ module.exports = function(grunt) {
         hspRoot         = grunt.config('hspserver.base')+"/hsp",
         emptyJsResponse = function(req, res) { res.set('Content-Type', 'application/x-javascript'); return res.send(""); },
         compilerPath    = '/dist/' + VERSION + '/hashspace-noder-compiler.min.js',
-        runtimePath     = '/dist/' + VERSION + '/hashspace-noder.min.js';
+        runtimePath     = '/dist/' + VERSION + '/hashspace-noder.min.js',
+        gesturesPath    = '/dist/' + VERSION + '/hashspace-noder-gestures.min.js';
 
     grunt.log.subhead('Local website setup');
     grunt.log.writeln('Starting local documentation web server...');
@@ -287,6 +288,8 @@ module.exports = function(grunt) {
     grunt.verbose.ok(compilerPath, 'polyfilled to be empty');
     app.get(runtimePath, emptyJsResponse);
     grunt.verbose.ok(runtimePath, 'polyfilled to be empty');
+    app.get(gesturesPath, emptyJsResponse);
+    grunt.verbose.ok(gesturesPath, 'polyfilled to be empty');
 
     // Proxying /test and /node_modules folders
     app.use('/test', function(req, res, next) {
diff --git a/docs/playground/index.md b/docs/playground/index.md
index ac09d49..d3c6d5b 100644
--- a/docs/playground/index.md
+++ b/docs/playground/index.md
@@ -19,6 +19,7 @@ footerscripts: |
         }
     </script>
     <script src="/dist/<%=version%>/hashspace-noder.min.js" type="text/javascript"></script>
+    <script src="/dist/<%=version%>/hashspace-noder-gestures.min.js" type="text/javascript"></script>
     <script src="/playground/playground-samples-all.js" type="text/javascript"></script>
     <script src="/playground/playground-all.js" type="text/javascript"></script>
     <script type="noder">
diff --git a/docs/samples/gestures/gestures.hsp b/docs/samples/gestures/gestures.hsp
index 128bc7d..d57073c 100644
--- a/docs/samples/gestures/gestures.hsp
+++ b/docs/samples/gestures/gestures.hsp
@@ -1,3 +1,5 @@
+require('hsp/gestures/doubleTap'); require('hsp/gestures/drag'); require('hsp/gestures/longPress'); require('hsp/gestures/pinch'); require('hsp/gestures/singleTap'); require('hsp/gestures/swipe');require('hsp/gestures/tap');
+
 {template gestures(msgList)}
     <div class="touchboard" style="height:200px; background: #27AAFC;text-align:center;"
     	ontap="{addMsg(event)}" ontapstart="{addMsg(event)}" ontapcancel="{addMsg(event)}"
diff --git a/gruntfile.js b/gruntfile.js
index 7d50027..02b085c 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -248,11 +248,6 @@ module.exports = function (grunt) {
               cwd: "hsp/rt",
               src: ['*.js'],
               dest: 'hsp/rt'
-            },
-            {
-              cwd: "hsp/gestures",
-              src: ['*.js'],
-              dest: 'hsp/gestures'
             }
           ]
         }
@@ -268,6 +263,18 @@ module.exports = function (grunt) {
             }
           ]
         }
+      },
+      gestures: {
+        files: [{dest: 'dist/hashspace-browserify-gestures.js', src: ['hsp/rt.js']}],
+        options: {
+          aliasMappings: [
+            {
+              cwd: "hsp/gestures",
+              src: ['*.js'],
+              dest: 'hsp/gestures'
+            }
+          ]
+        }
       }
     },
     uglify: {
@@ -275,8 +282,10 @@ module.exports = function (grunt) {
         files: [
           {dest: 'dist/hashspace-browserify.min.js', src: ['dist/hashspace-browserify.js']},
           {dest: 'dist/hashspace-browserify-compiler.min.js', src: ['dist/hashspace-browserify-compiler.js']},
+          {dest: 'dist/hashspace-browserify-gestures.min.js', src: ['dist/hashspace-browserify-gestures.js']},
           {dest: 'dist/hashspace-noder.min.js', src: ['dist/hashspace-noder.js']},
-          {dest: 'dist/hashspace-noder-compiler.min.js', src: ['dist/hashspace-noder-compiler.js']}
+          {dest: 'dist/hashspace-noder-compiler.min.js', src: ['dist/hashspace-noder-compiler.js']},
+          {dest: 'dist/hashspace-noder-gestures.min.js', src: ['dist/hashspace-noder-gestures.js']}
         ]
       }
     },
@@ -342,10 +351,13 @@ module.exports = function (grunt) {
           },
           packages : [{
             name : "hashspace-noder.js",
-            files : ['hsp/*.js', 'hsp/rt/*.js', 'hsp/gestures/*.js']
+            files : ['hsp/*.js', 'hsp/rt/*.js']
           }, {
             name : "hashspace-noder-compiler.js",
             files : ['hsp/compiler/compile.js','hsp/transpiler/transpile.js']
+          }, {
+            name : "hashspace-noder-gestures.js",
+            files : ['hsp/gestures/*.js']
           }]
         }
       }
diff --git a/hsp/gestures/doubleTap.js b/hsp/gestures/doubleTap.js
index 6483d90..bd4c299 100644
--- a/hsp/gestures/doubleTap.js
+++ b/hsp/gestures/doubleTap.js
@@ -1,6 +1,7 @@
 var klass = require("../klass");
 var touchEvent = require("./touchEvent");
 var Gesture = require("./gesture").Gesture;
+var GestureHandler = require("./gesture").GestureHandler;
 
 var DoubleTap = klass({
     $extends : Gesture,
@@ -158,4 +159,4 @@ var DoubleTap = klass({
 
 });
 
-module.exports.DoubleTap = DoubleTap;
\ No newline at end of file
+new GestureHandler(["doubletap", "doubletapstart", "doubletapcancel"], DoubleTap);
diff --git a/hsp/gestures/drag.js b/hsp/gestures/drag.js
index d0b6c42..36ced35 100644
--- a/hsp/gestures/drag.js
+++ b/hsp/gestures/drag.js
@@ -1,6 +1,7 @@
 var klass = require("../klass");
 var touchEvent = require("./touchEvent");
 var Gesture = require("./gesture").Gesture;
+var GestureHandler = require("./gesture").GestureHandler;
 
 var Drag = klass({
     $extends : Gesture,
@@ -112,4 +113,4 @@ var Drag = klass({
 
 });
 
-module.exports.Drag = Drag;
\ No newline at end of file
+new GestureHandler(["drag", "dragstart", "dragmove", "dragcancel"], Drag);
diff --git a/hsp/gestures/gesture.js b/hsp/gestures/gesture.js
index f9576b6..1e2abb5 100644
--- a/hsp/gestures/gesture.js
+++ b/hsp/gestures/gesture.js
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+var hsp = require("../rt");
 var klass = require("../klass");
 var touchEvent = require("./touchEvent");
 
@@ -25,7 +25,7 @@ var Gesture = klass({
     /**
      * Constructor.
      */
-    $constructor : function (target, evthandler) {
+    $constructor : function (target, callback) {
         /**
          * Reference to the target
          * @type HTMLElement
@@ -34,9 +34,9 @@ var Gesture = klass({
 
         /**
          * Reference to the event handler
-         * @type HTMLElement
+         * @type Function
          */
-        this.evthandler = evthandler;
+        this.callback = callback;
 
         /**
          * Event map uses ./touchEvent for touch event detection.
@@ -331,7 +331,7 @@ var Gesture = klass({
         extraData.currentX = position[0].x;
         extraData.currentY = position[0].y;
         fakeEvent.detail = extraData;
-        this.evthandler.handleEvent(fakeEvent);
+        this.callback(fakeEvent);
         event.cancelBubble = fakeEvent.hasStopPropagation;
         event.returnValue = !fakeEvent.hasPreventDefault;
         return event.returnValue;
@@ -364,4 +364,58 @@ var Gesture = klass({
     }
 });
 
-module.exports.Gesture = Gesture;
\ No newline at end of file
+module.exports.Gesture = Gesture;
+
+var GestureHandler = klass({
+    /**
+     * The contructor.
+     */
+    $constructor : function (list, klass) {
+        this.evtHandlers = [];
+        for (var i = 0; i < list.length; i++) {
+            hsp.registerCustomAttributes(list[i], this);
+        }
+        this._list = list;
+        this._klass = klass;
+    },
+
+    /**
+     * Starts the right gesture for the event.
+     * @param {String} the event name
+     * @param {Object} the attribute value (same as name for events)
+     * @param {HTMLElement} the event target
+     * @param {Function} the callback
+     */
+    handleAttribute : function(evtName, value, target, callback) {
+        var index = this._list.indexOf(evtName);
+        if (index >= 0) {
+            var alreadyInstanciated = false;
+            for (var i = 0, size = this.evtHandlers.length; size > i; i++) {
+                if (this.evtHandlers[i].target == target) {
+                    alreadyInstanciated = true;
+                    break;
+                }
+            }
+            if (!alreadyInstanciated) {
+                this.evtHandlers.push(new this._klass(target, callback));
+            }
+        }
+    },
+
+    /**
+     * Cleans the handlers when the target is disposed.
+     * @param {String} the event name
+     * @param {HTMLElement} the event target
+     */
+    cleanHandlers: function(evtName, target) {
+        for (var i = 0; i < this.evtHandlers.length; i++) {
+            var index = this.evtHandlers.length - i - 1;
+            if (this.evtHandlers[index].target == target) {
+                this.evtHandlers[index].$dispose();
+                this.evtHandlers.splice(index, 1);
+            }
+        }
+    }
+});
+
+module.exports.GestureHandler = GestureHandler;
diff --git a/hsp/gestures/gestures.js b/hsp/gestures/gestures.js
deleted file mode 100644
index 66c754a..0000000
--- a/hsp/gestures/gestures.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2012 Amadeus s.a.s.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-var klass = require("../klass");
-var Tap = require("./tap").Tap;
-var LongPress = require("./longPress").LongPress;
-var SingleTap = require("./singleTap").SingleTap;
-var DoubleTap = require("./doubleTap").DoubleTap;
-var Swipe = require("./swipe").Swipe;
-var Drag = require("./drag").Drag;
-var Pinch = require("./pinch").Pinch;
-/**
- * Mapping between the event name and the handling class.
- * @type Object
- */
-var _gestureMap = {
-    tap: {name: "Tap", klass: Tap},
-    tapstart: {name: "Tap", klass: Tap},
-    tapcancel: {name: "Tap", klass: Tap},
-    longpress: {name: "LongPress", klass: LongPress},
-    longpressstart: {name: "LongPress", klass: LongPress},
-    longpresscancel: {name: "LongPress", klass: LongPress},
-    singletap: {name: "SingleTap", klass: SingleTap},
-    singletapstart: {name: "SingleTap", klass: SingleTap},
-    singletapcancel: {name: "SingleTap", klass: SingleTap},
-    doubletap: {name: "DoubleTap", klass: DoubleTap},
-    doubletapstart: {name: "DoubleTap", klass: DoubleTap},
-    doubletapcancel: {name: "DoubleTap", klass: DoubleTap},
-    swipe: {name: "Swipe", klass: Swipe},
-    swipestart: {name: "Swipe", klass: Swipe},
-    swipemove: {name: "Swipe", klass: Swipe},
-    swipecancel: {name: "Swipe", klass: Swipe},
-    drag: {name: "Drag", klass: Drag},
-    dragstart: {name: "Drag", klass: Drag},
-    dragmove: {name: "Drag", klass: Drag},
-    dragcancel: {name: "Drag", klass: Drag},
-    pinch: {name: "Pinch", klass: Pinch},
-    pinchstart: {name: "Pinch", klass: Pinch},
-    pinchmove: {name: "Pinch", klass: Pinch},
-    pinchcancel: {name: "Pinch", klass: Pinch}
-};
-
-/**
- * Utility method to check if an event has to be handled by this gestures module.
- * @param {String} the event name
- * @return {Boolean} the result
- */
-exports.isGesture = function(evtName) {
-    return typeof _gestureMap[evtName] != "undefined";
-};
-
-var Gestures = klass({
-    /**
-     * The contructor.
-     */
-    $constructor : function () {
-        this.evtHandlers = [];
-    },
-
-    /**
-     * Starts the right gesture for the event.
-     * @param {String} the event name
-     * @param {HTMLElement} the event target
-     * @param {Object} the delegating event handler
-     */
-    startGesture : function(evtName, target, evtHandler) {
-        var mapping = _gestureMap[evtName];
-        if (typeof mapping != "undefined") {
-            var alreadyInstanciated = false;
-            for (var i = 0, size = this.evtHandlers.length; size > i; i++) {
-                if (this.evtHandlers[i].name === mapping.name) {
-                    alreadyInstanciated = true;
-                    break;
-                }
-            }
-            if (!alreadyInstanciated) {
-                this.evtHandlers.push({name: mapping.name, instance: new mapping.klass(target, evtHandler)});
-            }
-        }
-    },
-
-    /**
-     * Disposes all created gestures.
-     */
-    $dispose : function () {
-        for (var i = 0, size = this.evtHandlers.length; size > i; i++) {
-            this.evtHandlers[i].instance.$dispose();
-        }
-        this.evtHandlers = null;
-    }
-});
-
-module.exports.Gestures = Gestures;
-
diff --git a/hsp/gestures/longPress.js b/hsp/gestures/longPress.js
index 55ea908..d3d4946 100644
--- a/hsp/gestures/longPress.js
+++ b/hsp/gestures/longPress.js
@@ -1,6 +1,7 @@
 var klass = require("../klass");
 var touchEvent = require("./touchEvent");
 var Gesture = require("./gesture").Gesture;
+var GestureHandler = require("./gesture").GestureHandler;
 
 var LongPress = klass({
     $extends : Gesture,
@@ -126,4 +127,4 @@ var LongPress = klass({
 
 });
 
-module.exports.LongPress = LongPress;
\ No newline at end of file
+new GestureHandler(["longpress", "longpressstart", "longpresscancel"], LongPress);
diff --git a/hsp/gestures/pinch.js b/hsp/gestures/pinch.js
index 85f5682..a68ee01 100644
--- a/hsp/gestures/pinch.js
+++ b/hsp/gestures/pinch.js
@@ -1,6 +1,7 @@
 var klass = require("../klass");
 var touchEvent = require("./touchEvent");
 var Gesture = require("./gesture").Gesture;
+var GestureHandler = require("./gesture").GestureHandler;
 
 var Pinch = klass({
     $extends : Gesture,
@@ -179,4 +180,4 @@ var Pinch = klass({
 
 });
 
-module.exports.Pinch = Pinch;
\ No newline at end of file
+new GestureHandler(["pinch", "pinchstart", "pinchmove", "pinchcancel"], Pinch);
diff --git a/hsp/gestures/singleTap.js b/hsp/gestures/singleTap.js
index 8bdddff..901967c 100644
--- a/hsp/gestures/singleTap.js
+++ b/hsp/gestures/singleTap.js
@@ -1,6 +1,7 @@
 var klass = require("../klass");
 var touchEvent = require("./touchEvent");
 var Gesture = require("./gesture").Gesture;
+var GestureHandler = require("./gesture").GestureHandler;
 
 var SingleTap = klass({
     $extends : Gesture,
@@ -155,4 +156,4 @@ var SingleTap = klass({
 
 });
 
-module.exports.SingleTap = SingleTap;
\ No newline at end of file
+new GestureHandler(["singletap", "singletapstart", "singletapcancel"], SingleTap);
diff --git a/hsp/gestures/swipe.js b/hsp/gestures/swipe.js
index 64c4cb5..6071653 100644
--- a/hsp/gestures/swipe.js
+++ b/hsp/gestures/swipe.js
@@ -1,6 +1,7 @@
 var klass = require("../klass");
 var touchEvent = require("./touchEvent");
 var Gesture = require("./gesture").Gesture;
+var GestureHandler = require("./gesture").GestureHandler;
 
 var Swipe = klass({
     $extends : Gesture,
@@ -155,4 +156,4 @@ var Swipe = klass({
 
 });
 
-module.exports.Swipe = Swipe;
\ No newline at end of file
+new GestureHandler(["swipe", "swipestart", "swipemove", "swipecancel"], Swipe);
diff --git a/hsp/gestures/tap.js b/hsp/gestures/tap.js
index 9d67e51..4017705 100644
--- a/hsp/gestures/tap.js
+++ b/hsp/gestures/tap.js
@@ -1,6 +1,7 @@
 var klass = require("../klass");
 var touchEvent = require("./touchEvent");
 var Gesture = require("./gesture").Gesture;
+var GestureHandler = require("./gesture").GestureHandler;
 
 var Tap = klass({
     $extends : Gesture,
@@ -92,4 +93,4 @@ var Tap = klass({
 
 });
 
-module.exports.Tap = Tap;
\ No newline at end of file
+new GestureHandler(["tap", "tapstart", "tapcancel"], Tap);
diff --git a/hsp/rt.js b/hsp/rt.js
index 3f4ce0c..ff243a0 100644
--- a/hsp/rt.js
+++ b/hsp/rt.js
@@ -222,3 +222,43 @@ function createShortcut (tagName, tagConstructor) {
         return new tagConstructor(a1, a2, a3, a4, a5, a6);
     };
 }
+
+/**
+ * Global registry for custom attributes
+ */
+
+/**
+ * The registry as a JSON object, e.g:
+ * {ontap: [{priority: 0, handler: gestures}, {priority: 1, handler: myCustomGestures}], dropdown: [{priority: -2, handler: myCustomDropdown}]}
+ */
+var customAttributesRegistry = {};
+/**
+ * Registers a custom attribute
+ * @param {String} name the name of the attribute
+ * @param {Object} handler the attribute handler module, which must implement a handleAttribute(name, value, node, callback) method, and optionally a cleanHandlers(name, node).
+ * @param {Integer} priority the priority of the handler, default value is 0, the higher the more priority (i.e. higher executed first).
+ */
+exports.registerCustomAttributes = function (name, handler, priority) {
+    if (name != null && handler != null) {
+        var prio = priority || 0;
+        if (customAttributesRegistry[name]) {
+            customAttributesRegistry[name].push({priority: prio, handler: handler});
+        }
+        else {
+            customAttributesRegistry[name] = [{priority: prio, handler: handler}];
+        }
+    }
+};
+/**
+ * Returns the list of custom attributes.
+ * @param {String} name the name of the attribute
+ * @return {Array} the list
+ * 
+ */
+exports.getCustomAttributes = function(name) {
+    if (name) {
+        if (customAttributesRegistry[name]) {
+            return customAttributesRegistry[name].sort(function(a, b){return b.priority - a.priority;});
+        }
+    }
+};
diff --git a/hsp/rt/eltnode.js b/hsp/rt/eltnode.js
index a37a384..345694a 100644
--- a/hsp/rt/eltnode.js
+++ b/hsp/rt/eltnode.js
@@ -20,7 +20,6 @@ var browser = require("./browser");
 var doc = require("./document");
 var TNode = require("./tnode").TNode;
 var hsp = require("../rt");
-var gestures = require("../gestures/gestures");
 var log = require("./log");
 
 var booleanAttributes = {
@@ -72,9 +71,9 @@ var EltNode = klass({
         if (children && children !== 0) {
             this.children = children;
         }
-        this.gesturesEventHandlers = null;
         this.needSubScope = (needSubScope===1);
         this._lastValue = null;
+        this._customAttributesHandlers = [];
     },
 
     $dispose : function () {
@@ -94,10 +93,13 @@ var EltNode = klass({
                 }
             }
         }
-        if (this.gesturesEventHandlers) {
-            this.gesturesEventHandlers.$dispose();
-            this.gesturesEventHandlers = null;
+        for (var j = 0; j < this._customAttributesHandlers.length; j++) {
+            var item = this._customAttributesHandlers[j];
+            if (item.handler.cleanHandlers) {
+                item.handler.cleanHandlers(item.name, nd);
+            }
         }
+        this._customAttributesHandlers = null;
         this._attachEventFn = null;
         TNode.$dispose.call(this);
     },
@@ -172,11 +174,12 @@ var EltNode = klass({
             if (evh) {
                 for (var i = 0, sz = evh.length; sz > i; i++) {
                     hnd = evh[i];
-                    if (gestures.isGesture(hnd.evtType)) {
-                        if (this.gesturesEventHandlers == null) {
-                            this.gesturesEventHandlers = new gestures.Gestures();
+                    var customHandlers = hsp.getCustomAttributes(hnd.evtType);
+                    if (customHandlers && customHandlers.length > 0) {
+                        for (var j = 0; j < customHandlers.length; j++) {
+                            this._customAttributesHandlers.push({name: hnd.evtType, handler: customHandlers[j].handler});
+                            customHandlers[j].handler.handleAttribute(hnd.evtType, hnd.evtType, nd, this.handleEvent.bind(this));
                         }
-                        this.gesturesEventHandlers.startGesture(hnd.evtType, nd, this);
                     } else {
                         evts[hnd.evtType] = true;
                         if (addEL) {
@@ -282,6 +285,13 @@ var EltNode = klass({
                     }
                 }
                 nm = att.name;
+                var customHandlers = hsp.getCustomAttributes(nm);
+                if (customHandlers && customHandlers.length > 0) {
+                    for (var j = 0; j < customHandlers.length; j++) {
+                        this._customAttributesHandlers.push({name: nm, handler: customHandlers[j].handler});
+                        customHandlers[j].handler.handleAttribute(nm, att.getValue(eh, vs, null), nd);
+                    }
+                }
                 if (nm === "model") {
                     // this is an hashspace extension attribute
                     continue;
diff --git a/test/gestures/doubleTap.spec.hsp b/test/gestures/doubleTap.spec.hsp
index a45a85e..3d70427 100644
--- a/test/gestures/doubleTap.spec.hsp
+++ b/test/gestures/doubleTap.spec.hsp
@@ -17,6 +17,7 @@
  * Taken from Aria Templates: https://github.com/ariatemplates/ariatemplates/blob/master/test/aria/touch/gestures/DoubleTap.js
  */
 
+require("hsp/gestures/doubleTap");
 var fireEvent=require("hsp/utils/eventgenerator").fireEvent,
     touchEventMap = require("hsp/gestures/touchEvent").touchEventMap;
 
diff --git a/test/gestures/drag.spec.hsp b/test/gestures/drag.spec.hsp
index b5fd083..14a8f70 100644
--- a/test/gestures/drag.spec.hsp
+++ b/test/gestures/drag.spec.hsp
@@ -17,6 +17,7 @@
  * Taken from Aria Templates: https://github.com/ariatemplates/ariatemplates/blob/master/test/aria/touch/gestures/Drag.js
  */
 
+require("hsp/gestures/drag");
 var fireEvent=require("hsp/utils/eventgenerator").fireEvent,
     touchEventMap = require("hsp/gestures/touchEvent").touchEventMap;
 
diff --git a/test/gestures/longPress.spec.hsp b/test/gestures/longPress.spec.hsp
index 2c2c0fb..06adf53 100644
--- a/test/gestures/longPress.spec.hsp
+++ b/test/gestures/longPress.spec.hsp
@@ -17,6 +17,7 @@
  * Taken from Aria Templates: https://github.com/ariatemplates/ariatemplates/blob/master/test/aria/touch/gestures/LongPress.js
  */
 
+require("hsp/gestures/longPress");
 var fireEvent=require("hsp/utils/eventgenerator").fireEvent,
     touchEventMap = require("hsp/gestures/touchEvent").touchEventMap;
 
diff --git a/test/gestures/pinch.spec.hsp b/test/gestures/pinch.spec.hsp
index 58c189f..9871528 100644
--- a/test/gestures/pinch.spec.hsp
+++ b/test/gestures/pinch.spec.hsp
@@ -17,6 +17,7 @@
  * Taken from Aria Templates: https://github.com/ariatemplates/ariatemplates/blob/master/test/aria/touch/gestures/Pinch.js
  */
 
+require("hsp/gestures/pinch");
 var fireEvent=require("hsp/utils/eventgenerator").fireEvent,
     touchEventMap = require("hsp/gestures/touchEvent").touchEventMap;
 
diff --git a/test/gestures/singleTap.spec.hsp b/test/gestures/singleTap.spec.hsp
index c31f6e5..0a0acf2 100644
--- a/test/gestures/singleTap.spec.hsp
+++ b/test/gestures/singleTap.spec.hsp
@@ -17,6 +17,7 @@
  * Taken from Aria Templates: https://github.com/ariatemplates/ariatemplates/blob/master/test/aria/touch/gestures/SingleTap.js
  */
 
+require("hsp/gestures/singleTap");
 var fireEvent=require("hsp/utils/eventgenerator").fireEvent,
     touchEventMap = require("hsp/gestures/touchEvent").touchEventMap;
 
diff --git a/test/gestures/swipe.spec.hsp b/test/gestures/swipe.spec.hsp
index 5dd0cca..2de2f92 100644
--- a/test/gestures/swipe.spec.hsp
+++ b/test/gestures/swipe.spec.hsp
@@ -17,6 +17,7 @@
  * Taken from Aria Templates: https://github.com/ariatemplates/ariatemplates/blob/master/test/aria/touch/gestures/Swipe.js
  */
 
+require("hsp/gestures/swipe");
 var fireEvent=require("hsp/utils/eventgenerator").fireEvent,
     touchEventMap = require("hsp/gestures/touchEvent").touchEventMap;
 
diff --git a/test/gestures/tap.spec.hsp b/test/gestures/tap.spec.hsp
index 9f1495b..9fa38d7 100644
--- a/test/gestures/tap.spec.hsp
+++ b/test/gestures/tap.spec.hsp
@@ -17,6 +17,7 @@
  * Taken from Aria Templates: https://github.com/ariatemplates/ariatemplates/blob/master/test/aria/touch/gestures/Tap.js
  */
 
+require("hsp/gestures/tap");
 var fireEvent=require("hsp/utils/eventgenerator").fireEvent,
     touchEventMap = require("hsp/gestures/touchEvent").touchEventMap;
 
@@ -24,6 +25,9 @@ var fireEvent=require("hsp/utils/eventgenerator").fireEvent,
     <div title="test1" ontap="{ctl.handleTap(event)}" ontapstart="{ctl.handleTap(event)}" ontapcancel="{ctl.handleTap(event)}">
         Hello!
     </div>
+    <div title="test2" ontap="{ctl.handleTap(event)}" ontapstart="{ctl.handleTap(event)}" ontapcancel="{ctl.handleTap(event)}">
+        Hello!
+    </div>
 {/template}
 
 describe("Tap gesture", function () {
@@ -123,4 +127,29 @@ describe("Tap gesture", function () {
         n.$dispose();
     });
 
+    it("tests a valid tap on the second element: touchstart, touchmove with distance <= 10, touchend", function () {
+        var expected =  ["tapstart", "tap"];
+        var result = [];
+        var ctl = {
+            handleTap : function (evt) {
+                result.push(evt.type);
+            }
+        };
+        var n = test1(ctl);
+        fireEvent(touchEventMap.touchstart, n.node.childNodes[1], {
+            clientX : 0,
+            clientY : 0
+        });
+        fireEvent(touchEventMap.touchmove, n.node.childNodes[1], {
+            clientX : 5,
+            clientY : 5
+        });
+        fireEvent(touchEventMap.touchend, n.node.childNodes[1], {
+            clientX : 5,
+            clientY : 5
+        });
+        validate(expected, result);
+        n.$dispose();
+    });
+
 });
diff --git a/test/rt/customAttributes.spec.hsp b/test/rt/customAttributes.spec.hsp
new file mode 100644
index 0000000..58ffd8f
--- /dev/null
+++ b/test/rt/customAttributes.spec.hsp
@@ -0,0 +1,104 @@
+var hsp = require("hsp/rt");
+var klass = klass=require("hsp/klass");
+
+{template test1(ctl)}
+    <div title="test1" style="height: 20px" verybigdiv>
+        Hello!
+    </div>
+{/template}
+
+{template test2(ctl)}
+    <div title="test1" style="height: 20px" customheightdiv="50">
+        Hello!
+    </div>
+{/template}
+
+{template test3(ctl)}
+    <div title="test1" style="height: 20px" customheightdiv="{ctl.myHeight}">
+        Hello!
+    </div>
+{/template}
+
+{template test4(ctl)}
+    <div title="test1" style="height: 20px" customheightdiv="50" verybigdiv>
+        Hello!
+    </div>
+{/template}
+
+describe("Custom attributes", function () {
+
+    var status = null;
+    beforeEach(function() {
+        status = "Dirty";
+    });
+
+    var customHandler = new klass({
+        handleAttribute : function(name, value, target, callback) {
+            if (name == "verybigdiv") {
+                expect(value).to.equal("verybigdiv");
+                target.style.height = "100px";
+            }
+            else if (name == "customheightdiv") {
+                target.style.height = value + "px";
+            }
+        }
+    });
+
+    var customHandler2 = new klass({
+        handleAttribute : function(name, value, target, callback) {
+            if (name == "verybigdiv") {
+                expect(value).to.equal("verybigdiv");
+                target.style.height = "90px";
+            }
+        },
+        cleanHandlers: function(name, target) {
+            status = "Clean";
+        }
+    });
+
+    hsp.registerCustomAttributes("verybigdiv", customHandler, 2);
+    hsp.registerCustomAttributes("customheightdiv", customHandler);
+
+    it("tests a simple custom attribute", function () {
+        var n = test1();
+        expect(n.node.firstChild.style.height).to.equal("100px");
+        n.$dispose();
+        expect(status).to.equal("Dirty");
+    });
+
+    it("tests a custom attribute with static value", function () {
+        var n = test2();
+        expect(n.node.firstChild.style.height).to.equal("50px");
+        n.$dispose();
+        expect(status).to.equal("Dirty");
+    });
+
+    it("tests a custom attribute with dynamic value", function () {
+        var ctl = {
+            myHeight: 25
+        };
+        var n = test3(ctl);
+        expect(n.node.firstChild.style.height).to.equal("25px");
+        $set(ctl, "myHeight", 90);
+        hsp.refresh();
+        expect(n.node.firstChild.style.height).to.equal("90px");
+        n.$dispose();
+        expect(status).to.equal("Dirty");
+    });
+
+    it("tests a several custom attributes on same node", function () {
+        var n = test1();
+        expect(n.node.firstChild.style.height).to.equal("100px");
+        n.$dispose();
+        expect(status).to.equal("Dirty");
+    });
+
+    it("tests a simple custom attribute with several handlers", function () {
+        hsp.registerCustomAttributes("verybigdiv", customHandler2, 1);
+        var n = test1();
+        expect(n.node.firstChild.style.height).to.equal("90px");
+        n.$dispose();
+        expect(status).to.equal("Clean");
+    });
+
+});
\ No newline at end of file
diff --git a/test/rt/index.html b/test/rt/index.html
index c21061e..8f49155 100644
--- a/test/rt/index.html
+++ b/test/rt/index.html
@@ -60,6 +60,7 @@
 	require("test/rt/cptintegration.spec.hsp");
 	require("test/rt/cptrefresh.spec.hsp");
 	require("test/rt/cptwrapper.spec.hsp");
+	require("test/rt/customAttributes.spec.hsp");
 	require("test/rt/dynexpressions.spec.hsp");
 	require("test/rt/elt.spec.hsp");
 	require("test/rt/evthandler.spec.hsp");