diff --git a/bower.json b/bower.json
index 69f0b24..de65bab 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-footable",
-  "version": "0.0.2",
+  "version": "0.0.1",
   "homepage": "https://github.com/ziscloud/angular-footable",
   "authors": [
     "Tony Wang <ziscloud@gmail.com>"
diff --git a/dist/angular-footable.js b/dist/angular-footable.js
index d17d796..e383117 100755
--- a/dist/angular-footable.js
+++ b/dist/angular-footable.js
@@ -1,8 +1,9 @@
+!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var o;"undefined"!=typeof window?o=window:"undefined"!=typeof global?o=global:"undefined"!=typeof self&&(o=self),o.angularFootable=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(_dereq_,module,exports){
 'use strict';
 
 angular
     .module('ui.footable', [])
-    .directive('footable', ['$timeout', function($timeout) {
+    .directive('footable', function() {
         var events = {
             beforeFiltering: 'footable_filtering'
         };
@@ -52,12 +53,13 @@ angular
 
                 bindEventHandler(tableObj, scope, attrs);
 
-                scope.$watch(function() {return attrs.loadWhen; }, function(){
-                    $timeout(function(){
-                        element.trigger('footable_redraw');
-                    });
-                });
-
             }
         };
-    }]);
+    });
+
+},{}]},{},[1])
+
+(1)
+});
+
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi9Vc2Vycy90b255d2FuZy93b3Jrc3BhY2UvamF2YXNjcmlwdC9hbmd1bGFyLWZvb3RhYmxlL25vZGVfbW9kdWxlcy9ib2lsZXJwbGF0ZS1ndWxwL25vZGVfbW9kdWxlcy9icm93c2VyaWZ5L25vZGVfbW9kdWxlcy9icm93c2VyLXBhY2svX3ByZWx1ZGUuanMiLCIvVXNlcnMvdG9ueXdhbmcvd29ya3NwYWNlL2phdmFzY3JpcHQvYW5ndWxhci1mb290YWJsZS9zcmMvYW5ndWxhci1mb290YWJsZS5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTtBQ0FBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBIiwiZmlsZSI6ImFuZ3VsYXItZm9vdGFibGUuanMiLCJzb3VyY2VzQ29udGVudCI6WyIoZnVuY3Rpb24gZSh0LG4scil7ZnVuY3Rpb24gcyhvLHUpe2lmKCFuW29dKXtpZighdFtvXSl7dmFyIGE9dHlwZW9mIHJlcXVpcmU9PVwiZnVuY3Rpb25cIiYmcmVxdWlyZTtpZighdSYmYSlyZXR1cm4gYShvLCEwKTtpZihpKXJldHVybiBpKG8sITApO3Rocm93IG5ldyBFcnJvcihcIkNhbm5vdCBmaW5kIG1vZHVsZSAnXCIrbytcIidcIil9dmFyIGY9bltvXT17ZXhwb3J0czp7fX07dFtvXVswXS5jYWxsKGYuZXhwb3J0cyxmdW5jdGlvbihlKXt2YXIgbj10W29dWzFdW2VdO3JldHVybiBzKG4/bjplKX0sZixmLmV4cG9ydHMsZSx0LG4scil9cmV0dXJuIG5bb10uZXhwb3J0c312YXIgaT10eXBlb2YgcmVxdWlyZT09XCJmdW5jdGlvblwiJiZyZXF1aXJlO2Zvcih2YXIgbz0wO288ci5sZW5ndGg7bysrKXMocltvXSk7cmV0dXJuIHN9KSIsIid1c2Ugc3RyaWN0JztcblxuYW5ndWxhclxuICAgIC5tb2R1bGUoJ3VpLmZvb3RhYmxlJywgW10pXG4gICAgLmRpcmVjdGl2ZSgnZm9vdGFibGUnLCBmdW5jdGlvbigpIHtcbiAgICAgICAgdmFyIGV2ZW50cyA9IHtcbiAgICAgICAgICAgIGJlZm9yZUZpbHRlcmluZzogJ2Zvb3RhYmxlX2ZpbHRlcmluZydcbiAgICAgICAgfTtcbiAgICAgICAgdmFyIGV4dHJhY3RTcGVjT3B0cyA9IGZ1bmN0aW9uKG9wdHMsIGF0dHJzKSB7XG4gICAgICAgICAgICB2YXIgZXh0cmFjdGVkID0ge30sXG4gICAgICAgICAgICAgICAgaztcbiAgICAgICAgICAgIGZvciAoayBpbiBvcHRzKSB7XG4gICAgICAgICAgICAgICAgaWYgKGsgIT09ICdmaWx0ZXInICYmICghYW5ndWxhci5pc1VuZGVmaW5lZChldmVudHNba10pKSkge1xuICAgICAgICAgICAgICAgICAgICBpZighYW5ndWxhci5pc0Z1bmN0aW9uKHNjb3BlLiRldmFsKGF0dHJzW2tdKSkpIHtcbiAgICAgICAgICAgICAgICAgICAgICAgIGV4dHJhY3RlZFtrXSA9IGF0dHJzW2tdO1xuICAgICAgICAgICAgICAgICAgICB9XG4gICAgICAgICAgICAgICAgfVxuICAgICAgICAgICAgfVxuICAgICAgICAgICAgcmV0dXJuIGV4dHJhY3RlZDtcbiAgICAgICAgfTtcblxuICAgICAgICB2YXIgYmluZEV2ZW50SGFuZGxlciA9IGZ1bmN0aW9uKHRhYmxlT2JqLCBzY29wZSwgYXR0cnMpIHtcbiAgICAgICAgICAgIHZhciBrO1xuICAgICAgICAgICAgZm9yIChrIGluIGF0dHJzKSB7XG4gICAgICAgICAgICAgICAgaWYgKGsgIT09ICdmaWx0ZXInICYmICghYW5ndWxhci5pc1VuZGVmaW5lZChldmVudHNba10pKSkge1xuICAgICAgICAgICAgICAgICAgICB2YXIgdGFyZ2V0RXZlbnROYW1lID0gZXZlbnRzW2tdO1xuICAgICAgICAgICAgICAgICAgICBpZihhbmd1bGFyLmlzRnVuY3Rpb24oc2NvcGUuJGV2YWwoYXR0cnNba10pKSkge1xuICAgICAgICAgICAgICAgICAgICAgICAgdGFibGVPYmouYmluZCh0YXJnZXRFdmVudE5hbWUsIHNjb3BlLiRldmFsKGF0dHJzW2tdKSk7XG4gICAgICAgICAgICAgICAgICAgIH1cbiAgICAgICAgICAgICAgICB9XG4gICAgICAgICAgICB9XG4gICAgICAgIH07XG5cbiAgICAgICAgcmV0dXJuIHtcbiAgICAgICAgICAgIHJlc3RyaWN0OiAnQycsXG4gICAgICAgICAgICBsaW5rOiBmdW5jdGlvbihzY29wZSwgZWxlbWVudCwgYXR0cnMpIHtcbiAgICAgICAgICAgICAgICB2YXIgdGFibGVPcHRzID0ge1xuICAgICAgICAgICAgICAgICAgICAnZXZlbnQtZmlsdGVyaW5nJzogbnVsbFxuICAgICAgICAgICAgICAgIH07XG5cbiAgICAgICAgICAgICAgICBhbmd1bGFyLmV4dGVuZChcbiAgICAgICAgICAgICAgICAgICAgdGFibGVPcHRzLFxuICAgICAgICAgICAgICAgICAgICBmb290YWJsZS5vcHRpb25zXG4gICAgICAgICAgICAgICAgKTtcblxuICAgICAgICAgICAgICAgIGFuZ3VsYXIuZXh0ZW5kKFxuICAgICAgICAgICAgICAgICAgICB0YWJsZU9wdHMsXG4gICAgICAgICAgICAgICAgICAgIGV4dHJhY3RTcGVjT3B0cyh0YWJsZU9wdHMsIGF0dHJzKVxuICAgICAgICAgICAgICAgICk7XG5cbiAgICAgICAgICAgICAgICB2YXIgdGFibGVPYmogPSBlbGVtZW50LmZvb3RhYmxlKHRhYmxlT3B0cyk7XG5cbiAgICAgICAgICAgICAgICBiaW5kRXZlbnRIYW5kbGVyKHRhYmxlT2JqLCBzY29wZSwgYXR0cnMpO1xuXG4gICAgICAgICAgICB9XG4gICAgICAgIH07XG4gICAgfSk7XG4iXSwic291cmNlUm9vdCI6Ii9zb3VyY2UvIn0=
\ No newline at end of file
diff --git a/dist/angular-footable.min.js b/dist/angular-footable.min.js
index a26a327..292bc81 100755
--- a/dist/angular-footable.min.js
+++ b/dist/angular-footable.min.js
@@ -1 +1,2 @@
-"use strict";angular.module("ui.footable",[]).directive("footable",["$timeout",function(n){var e={beforeFiltering:"footable_filtering"},i=function(n,i){var t,r={};for(t in n)"filter"===t||angular.isUndefined(e[t])||angular.isFunction(scope.$eval(i[t]))||(r[t]=i[t]);return r},t=function(n,i,t){var r;for(r in t)if("filter"!==r&&!angular.isUndefined(e[r])){var a=e[r];angular.isFunction(i.$eval(t[r]))&&n.bind(a,i.$eval(t[r]))}};return{restrict:"C",link:function(e,r,a){var o={"event-filtering":null};angular.extend(o,footable.options),angular.extend(o,i(o,a));var l=r.footable(o);t(l,e,a),e.$watch(function(){return a.loadWhen},function(){n(function(){r.trigger("footable_redraw")})})}}}]);
\ No newline at end of file
+!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var n;"undefined"!=typeof window?n=window:"undefined"!=typeof global?n=global:"undefined"!=typeof self&&(n=self),n.angularFootable=e()}}(function(){return function e(n,r,t){function i(f,u){if(!r[f]){if(!n[f]){var a="function"==typeof require&&require;if(!u&&a)return a(f,!0);if(o)return o(f,!0);throw new Error("Cannot find module '"+f+"'")}var l=r[f]={exports:{}};n[f][0].call(l.exports,function(e){var r=n[f][1][e];return i(r?r:e)},l,l.exports,e,n,r,t)}return r[f].exports}for(var o="function"==typeof require&&require,f=0;f<t.length;f++)i(t[f]);return i}({1:[function(){"use strict";angular.module("ui.footable",[]).directive("footable",function(){var e={beforeFiltering:"footable_filtering"},n=function(n,r){var t,i={};for(t in n)"filter"===t||angular.isUndefined(e[t])||angular.isFunction(scope.$eval(r[t]))||(i[t]=r[t]);return i},r=function(n,r,t){var i;for(i in t)if("filter"!==i&&!angular.isUndefined(e[i])){var o=e[i];angular.isFunction(r.$eval(t[i]))&&n.bind(o,r.$eval(t[i]))}};return{restrict:"C",link:function(e,t,i){var o={"event-filtering":null};angular.extend(o,footable.options),angular.extend(o,n(o,i));var f=t.footable(o);r(f,e,i)}}})},{}]},{},[1])(1)});
+//# sourceMappingURL=angular-footable.min.js.map
\ No newline at end of file
diff --git a/dist/angular-footable.min.js.map b/dist/angular-footable.min.js.map
new file mode 100755
index 0000000..1c627e1
--- /dev/null
+++ b/dist/angular-footable.min.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["/Users/tonywang/workspace/javascript/angular-footable/node_modules/boilerplate-gulp/node_modules/browserify/node_modules/browser-pack/_prelude.js","/Users/tonywang/workspace/javascript/angular-footable/src/angular-footable.js"],"names":[],"mappings":"CAAA,SAAA,GAAA,GAAA,gBAAA,UAAA,mBAAA,QAAA,OAAA,QAAA,QAAA,IAAA,kBAAA,SAAA,OAAA,IAAA,UAAA,OAAA,CAAA,GAAA,EAAA,oBAAA,QAAA,EAAA,OAAA,mBAAA,QAAA,EAAA,OAAA,mBAAA,QAAA,EAAA,MAAA,EAAA,gBAAA,MAAA,WAAA,MAAA,SAAA,GAAA,EAAA,EAAA,GAAA,QAAA,GAAA,EAAA,GAAA,IAAA,EAAA,GAAA,CAAA,IAAA,EAAA,GAAA,CAAA,GAAA,GAAA,kBAAA,UAAA,OAAA,KAAA,GAAA,EAAA,MAAA,GAAA,GAAA,EAAA,IAAA,EAAA,MAAA,GAAA,GAAA,EAAA,MAAA,IAAA,OAAA,uBAAA,EAAA,KAAA,GAAA,GAAA,EAAA,IAAA,WAAA,GAAA,GAAA,GAAA,KAAA,EAAA,QAAA,SAAA,GAAA,GAAA,GAAA,EAAA,GAAA,GAAA,EAAA,OAAA,GAAA,EAAA,EAAA,IAAA,EAAA,EAAA,QAAA,EAAA,EAAA,EAAA,GAAA,MAAA,GAAA,GAAA,QAAA,IAAA,GAAA,GAAA,kBAAA,UAAA,QAAA,EAAA,EAAA,EAAA,EAAA,OAAA,IAAA,EAAA,EAAA,GAAA,OAAA,KAAA,GAAA,WCAA,YAEA,SACA,OAAA,kBACA,UAAA,WAAA,WACA,GAAA,IACA,gBAAA,sBAEA,EAAA,SAAA,EAAA,GACA,GACA,GADA,IAEA,KAAA,IAAA,GACA,WAAA,GAAA,QAAA,YAAA,EAAA,KACA,QAAA,WAAA,MAAA,MAAA,EAAA,OACA,EAAA,GAAA,EAAA,GAIA,OAAA,IAGA,EAAA,SAAA,EAAA,EAAA,GACA,GAAA,EACA,KAAA,IAAA,GACA,GAAA,WAAA,IAAA,QAAA,YAAA,EAAA,IAAA,CACA,GAAA,GAAA,EAAA,EACA,SAAA,WAAA,EAAA,MAAA,EAAA,MACA,EAAA,KAAA,EAAA,EAAA,MAAA,EAAA,MAMA,QACA,SAAA,IACA,KAAA,SAAA,EAAA,EAAA,GACA,GAAA,IACA,kBAAA,KAGA,SAAA,OACA,EACA,SAAA,SAGA,QAAA,OACA,EACA,EAAA,EAAA,GAGA,IAAA,GAAA,EAAA,SAAA,EAEA,GAAA,EAAA,EAAA","file":"angular-footable.min.js","sourcesContent":["(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error(\"Cannot find module '\"+o+\"'\")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})","'use strict';\n\nangular\n    .module('ui.footable', [])\n    .directive('footable', function() {\n        var events = {\n            beforeFiltering: 'footable_filtering'\n        };\n        var extractSpecOpts = function(opts, attrs) {\n            var extracted = {},\n                k;\n            for (k in opts) {\n                if (k !== 'filter' && (!angular.isUndefined(events[k]))) {\n                    if(!angular.isFunction(scope.$eval(attrs[k]))) {\n                        extracted[k] = attrs[k];\n                    }\n                }\n            }\n            return extracted;\n        };\n\n        var bindEventHandler = function(tableObj, scope, attrs) {\n            var k;\n            for (k in attrs) {\n                if (k !== 'filter' && (!angular.isUndefined(events[k]))) {\n                    var targetEventName = events[k];\n                    if(angular.isFunction(scope.$eval(attrs[k]))) {\n                        tableObj.bind(targetEventName, scope.$eval(attrs[k]));\n                    }\n                }\n            }\n        };\n\n        return {\n            restrict: 'C',\n            link: function(scope, element, attrs) {\n                var tableOpts = {\n                    'event-filtering': null\n                };\n\n                angular.extend(\n                    tableOpts,\n                    footable.options\n                );\n\n                angular.extend(\n                    tableOpts,\n                    extractSpecOpts(tableOpts, attrs)\n                );\n\n                var tableObj = element.footable(tableOpts);\n\n                bindEventHandler(tableObj, scope, attrs);\n\n            }\n        };\n    });\n"],"sourceRoot":"/source/"}
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
index 8d20744..52205d2 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,30 +1,9 @@
-var gulp = require('gulp');
-
-var rename = require('gulp-rename');
-var clean = require('gulp-clean');
-var jshint = require('gulp-jshint');
-var concat = require('gulp-concat');
-var uglify = require('gulp-uglify');
-
-var paths = {
-	scripts: ['src/*.js'],
-};
-var bases = {
-	dist: 'dist'
-};
-gulp.task('clean', function(){
-	return gulp.src(bases.dist+'/*.js', {read:false})
-	.pipe(clean());
-});
-gulp.task('scripts', ['clean'], function(){
-	gulp.src(paths.scripts)
-	.pipe(jshint())
-	.pipe(jshint.reporter('default'))
-	.pipe(gulp.dest(bases.dist))
-	.pipe(uglify())
-	.pipe(rename({
-      extname: '.min.js'
-    }))
-	.pipe(gulp.dest(bases.dist));
-});
-gulp.task('default',['scripts']);
\ No newline at end of file
+var gulp = require('gulp'),
+    boilerplate = require('boilerplate-gulp');
+    
+boilerplate(gulp, {
+    pkg: require('./package.json'),
+    jsMain: './src/angular-footable.js',
+    karmaConfig: require('./test/karma.conf.js'),
+    connectConfig: require('./example/connect.conf.js')
+});
\ No newline at end of file
diff --git a/package.json b/package.json
index 703383e..04720c5 100644
--- a/package.json
+++ b/package.json
@@ -1,36 +1,30 @@
 {
-  "name": "angular-footable",
-  "version": "0.0.1",
-  "description": "Angular derictive for FooTable",
-  "main": "dist/angular-footable.js",
-  "directories": {
-    "test": "test"
-  },
-  "scripts": {
-    "test": "gulp test"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ziscloud/angular-footable.git"
-  },
-  "keywords": [
-    "angular",
-    "footable"
-  ],
-  "author": "Tony Wang",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/ziscloud/angular-footable/issues"
-  },
-  "homepage": "https://github.com/ziscloud/angular-footable",
-  "devDependencies": {
-    "boilerplate-gulp": "~0.3.0",
-    "gulp": "~3.8.0",
-    "gulp-clean": "^0.3.1",
-    "gulp-concat": "^2.6.0",
-    "gulp-jshint": "^2.0.0",
-    "gulp-rename": "^1.2.2",
-    "gulp-uglify": "^1.5.1",
-    "jshint": "^2.9.1"
-  }
+    "name": "angular-footable",
+    "version": "0.0.1",
+    "description": "Angular derictive for FooTable",
+    "main": "dist/angular-footable.js",
+    "directories": {
+        "test": "test"
+    },
+    "scripts": {
+        "test": "gulp test"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/ziscloud/angular-footable.git"
+    },
+    "keywords": [
+        "angular",
+        "footable"
+    ],
+    "author": "Tony Wang",
+    "license": "MIT",
+    "bugs": {
+        "url": "https://github.com/ziscloud/angular-footable/issues"
+    },
+    "homepage": "https://github.com/ziscloud/angular-footable",
+    "devDependencies": {
+        "gulp": "~3.8.0",
+        "boilerplate-gulp": "~0.3.0"
+    }
 }
diff --git a/src/angular-footable.js b/src/angular-footable.js
index d17d796..3d0fac4 100644
--- a/src/angular-footable.js
+++ b/src/angular-footable.js
@@ -2,7 +2,7 @@
 
 angular
     .module('ui.footable', [])
-    .directive('footable', ['$timeout', function($timeout) {
+    .directive('footable', function() {
         var events = {
             beforeFiltering: 'footable_filtering'
         };
@@ -52,12 +52,6 @@ angular
 
                 bindEventHandler(tableObj, scope, attrs);
 
-                scope.$watch(function() {return attrs.loadWhen; }, function(){
-                    $timeout(function(){
-                        element.trigger('footable_redraw');
-                    });
-                });
-
             }
         };
-    }]);
+    });
diff --git a/test/angular-footable.spec.js b/src/angular-footable.spec.js
similarity index 100%
rename from test/angular-footable.spec.js
rename to src/angular-footable.spec.js
diff --git a/test/karma.conf.js b/test/karma.conf.js
index 7303c51..eb09a34 100644
--- a/test/karma.conf.js
+++ b/test/karma.conf.js
@@ -3,7 +3,7 @@ module.exports = {
   frameworks: ['jasmine'],
 
   preprocessors: {
-    'test/**/!(*Spec).js': ['coverage'],
+    'src/**/!(*Spec).js': ['coverage'],
     'src/**/*.js': ['commonjs']
   },