diff --git a/.gitignore b/.gitignore
index 29a48a4..7ab073a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ app/
 node_modules/
 bower_components/
 .sass-cache/
-_includes/
\ No newline at end of file
+_includes/
+_site/
diff --git a/.jshintrc b/.jshintrc
index 3f76a8d..d4c0932 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -21,5 +21,5 @@
     "angular": true,
     "Packery": true,
     "Draggabilly": true
-  }  
-}
\ No newline at end of file
+  }
+}
diff --git a/.travis.yml  b/.travis.yml 
new file mode 100644
index 0000000..796d98f
--- /dev/null
+++ b/.travis.yml 	
@@ -0,0 +1,3 @@
+language: node_js
+node_js:
+  - "0.12"
diff --git a/Gruntfile.js b/Gruntfile.js
index efe987c..545ef94 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -65,4 +65,8 @@ module.exports = function( grunt ) {
     'usebanner'
   ]);
 
-};
\ No newline at end of file
+  grunt.registerTask( 'test', [
+    'jshint'
+  ]);
+
+};
diff --git a/LICENSE b/LICENSE
index b96700d..ccd1bfb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
+THE SOFTWARE.
diff --git a/README.MD b/README.MD
index 24c9ced..c15dbcf 100644
--- a/README.MD
+++ b/README.MD
@@ -2,6 +2,8 @@
 
 Angular module for the popular Packery library.
 
+![Travis CI](https://api.travis-ci.org/sungard-labs/angular-packery.png)
+
 
 #### Requirements ####
 
@@ -20,7 +22,7 @@ Angular module for the popular Packery library.
 By default, this module listens for an element or attribute call and instantiates with the options described in [Packery's API](http://packery.metafizzy.co/options.html). It looks to a self-created object, `div.packery-sizer`, to control the grid dimensions.
 
 ##### HTML #####
- 
+
 ```
 <packery ng-init="objects = [{id:'1'},{id:'2'},{id:'3'}]">
 
@@ -48,7 +50,7 @@ By default, this module listens for an element or attribute call and instantiate
 
 </packery>
 ```
-  
+
 #### CSS ####
 
 ```
@@ -119,7 +121,7 @@ This module supports almost all of the Packery options in their intended form. A
 
 ## CSS Classes / Animating ##
 
-Two CSS classes are applied to the objects to show depth during dragging events, `hovered` and `lifted`. The classes are triggered by both mouse events and touch events. 
+Two CSS classes are applied to the objects to show depth during dragging events, `hovered` and `lifted`. The classes are triggered by both mouse events and touch events.
 
 Animation can be applied easily with CSS:
 
diff --git a/bower.json b/bower.json
index da70ec6..48776c5 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-packery",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "author": "http://github.com/sungard-labs/angular-packery/graphs/contributors",
   "homepage": "http://github.com/sungard-labs/angular-packery",
   "repository": {
diff --git a/dist/packery.js b/dist/packery.js
index 784365e..8ce2a0e 100644
--- a/dist/packery.js
+++ b/dist/packery.js
@@ -1,7 +1,7 @@
 /*!
  * angular-packery
  * http://github.com/sungard-labs/angular-packery
- * Version: 1.0.2
+ * Version: 1.0.3
  * License: MIT
  */
 
@@ -61,11 +61,12 @@
             id: hash,
             packery: packeryObj
           });
+          el.data('Packery', packeryObj);
           $rootScope.$emit('packeryInstantiated', packeryObj);
           return packeryObj;
         } else {
           var interval = $interval(function(){
-            if (packeryObj !== undefined) { 
+            if (packeryObj !== undefined) {
               $interval.cancel(interval);
               deferred.resolve(packeryObj);
             }
@@ -75,7 +76,7 @@
             $interval.cancel(interval);
             deferred.reject(false);
           }, config.timeout);
-          
+
           return deferred.promise;
         }
       }
@@ -93,7 +94,7 @@
     self.packery = {};
 
     this.bindDragEvents = function(el) {
-      var handleSelector, handle, draggabilly;   
+      var handleSelector, handle, draggabilly;
 
       handleSelector = self.dragHandle;
 
@@ -104,14 +105,14 @@
         draggabilly = new Draggabilly(el[0], {
           handle: handleSelector
         });
-        handle = el.querySelectorAll(handleSelector);
+        handle = el[0].querySelectorAll(handleSelector);
       }
 
       // Init Draggabilly events
       self.packery.bindDraggabillyEvents(draggabilly);
 
       // Bind animate events for touch
-      handle.on('mouseenter', function(){
+      angular.element(handle).on('mouseenter', function(){
         el.addClass('hovered');
       }).
       on('mouseleave', function(){
@@ -156,7 +157,7 @@
 
         el.css('visibility','visible');
         $rootScope.$emit('packeryObjectPacked', el[0]);
-      });    
+      });
     };
 
     this.setDraggable = function (handle) {
@@ -166,6 +167,7 @@
   };
 
   var packeryDirective = function (config, service) {
+
     return {
       restrict: 'EAC',
       controller: 'PackeryController',
@@ -173,7 +175,7 @@
       replace: true,
       templateUrl: 'template/packery/packery.html',
       scope: {
-        containerStyle: '@?', // Type: Object, null
+        containerStyle: '=?', // Type: Object, null
         columnWidth: '@?', // Type: Number, Selector String
         gutter: '@?', // Type: Number, Selector String
         isHorizontal: '@?', // Type: Boolean
@@ -189,7 +191,7 @@
         handle: '@?' // Type: Boolean
 
         // Let's come back to this one...
-        // stamp: '@?', 
+        // stamp: '@?',
       },
       link: function (scope, element, attrs, controller) {
 
@@ -211,6 +213,9 @@
         if (scope.isOriginTop === 'false') { scope.isOriginTop = false; }
         if (scope.isResizeBound === 'false') { scope.isResizeBound = false; }
 
+        // Creates JS Object for passing CSS styles into Packery
+        if (scope.containerStyle && (typeof scope.containerStyle === 'object' )) { scope.containerStyle = scope.containerStyle; }
+
         // Set global draggability
         if (scope.draggable) { controller.setDraggable(scope.handle); }
 
@@ -247,7 +252,7 @@
         element.css('visibility','hidden');
 
         // Packs individual objects
-        controller.packObject(element);    
+        controller.packObject(element);
       }
     };
   };
@@ -255,7 +260,7 @@
   var packeryTemplates = function ($templateCache) {
     $templateCache
       .put('template/packery/packery.html', [
-        '<div>', 
+        '<div class="packery-wrapper">',
           '<div class="packery-sizer"></div>',
           '<div class="packery-container" ng-transclude></div>',
         '</div>'
diff --git a/dist/packery.min.js b/dist/packery.min.js
index b0aeb5e..a8a1d18 100644
--- a/dist/packery.min.js
+++ b/dist/packery.min.js
@@ -1,8 +1,8 @@
 /*!
  * angular-packery
  * http://github.com/sungard-labs/angular-packery
- * Version: 1.0.2
+ * Version: 1.0.3
  * License: MIT
  */
 
-"use strict";!function(){var a=["packeryTemplates"],b={columnWidth:".packery-sizer",itemSelector:".packery-object",rowHeight:".packery-sizer",draggable:!0,handle:"*",timeout:2e3,acceptedAttributes:["containerStyle","columnWidth","gutter","isHorizontal","isInitLayout","isOriginLeft","isOriginTop","isResizeBound","itemSelector","rowHeight","transitionDuration"]},c=function(a,b,c,d,e){var f,g=[],h=function(a,b){for(var c=0;c<b.length;c++)if(b[c].id===a)return!1;return!0};return{Packery:function(i,j,k){var l=b.defer();if(j=j||void 0,k=k||{},h(i,g)&&void 0!==j)return f=new Packery(j[0],k),g.push({id:i,packery:f}),a.$emit("packeryInstantiated",f),f;var m=c(function(){void 0!==f&&(c.cancel(m),l.resolve(f))},e.timeout/10);return d(function(){c.cancel(m),l.reject(!1)},e.timeout),l.promise}}},d=function(a,b,c){var d=this;d.packeryInstantiated=!1,d.packeryDraggable=!1,d.dragHandle=void 0,d.uniqueId=(new Date).getTime(),d.packery={},this.bindDragEvents=function(a){var b,c,e;b=d.dragHandle,"*"===b?(e=new Draggabilly(a[0]),c=a):(e=new Draggabilly(a[0],{handle:b}),c=a.querySelectorAll(b)),d.packery.bindDraggabillyEvents(e),c.on("mouseenter",function(){a.addClass("hovered")}).on("mouseleave",function(){a.removeClass("hovered")})},this.createAttrObj=function(a){for(var c={},d=b.acceptedAttributes,e=0;e<d.length;e++){var f=a[d[e]];void 0!==f&&(c[d[e]]="null"===f?null:isNaN(f)===!1?+a[d[e]]:a[d[e]])}return c},this.packObject=function(b){var e=c.Packery(d.uniqueId);e.then(function(){var c=d.packery.getItemElements();-1===c.indexOf(b[0])&&d.packery.appended(b[0]),d.packeryDraggable===!0&&d.bindDragEvents(b),b.css("visibility","visible"),a.$emit("packeryObjectPacked",b[0])})},this.setDraggable=function(a){d.packeryDraggable=!0,d.dragHandle=a}},e=function(a,b){return{restrict:"EAC",controller:"PackeryController",transclude:!0,replace:!0,templateUrl:"template/packery/packery.html",scope:{containerStyle:"@?",columnWidth:"@?",gutter:"@?",isHorizontal:"@?",isInitLayout:"@?",isOriginLeft:"@?",isOriginTop:"@?",isResizeBound:"@?",itemSelector:"@?",rowHeight:"@?",transitionDuration:"@?",draggable:"@?",handle:"@?"},link:function(c,d,e,f){var g,h,i;c.columnWidth=c.columnWidth||a.columnWidth,c.itemSelector=c.itemSelector||a.itemSelector,c.rowHeight=c.rowHeight||a.rowHeight,c.draggable=c.draggable||a.draggable,c.handle=c.handle||a.handle,"false"===c.draggable&&(c.draggable=!1),"false"===c.isHorizontal&&(c.isHorizontal=!1),"false"===c.isInitLayout&&(c.isInitLayout=!1),"false"===c.isOriginLeft&&(c.isOriginLeft=!1),"false"===c.isOriginTop&&(c.isOriginTop=!1),"false"===c.isResizeBound&&(c.isResizeBound=!1),c.draggable&&f.setDraggable(c.handle),g=f.createAttrObj(c),h=f.uniqueId,i=b.Packery(h,d,g),i instanceof Packery&&(f.packeryInstantiated=!0,f.packery=i)}}},f=function(){return{restrict:"EA",templateUrl:"template/packery/packery-object.html",transclude:!0,replace:!0}},g=function(){return{require:"^packery",restrict:"C",link:function(a,b,c,d){b.css("visibility","hidden"),d.packObject(b)}}},h=function(a){a.put("template/packery/packery.html",["<div>",'<div class="packery-sizer"></div>','<div class="packery-container" ng-transclude></div>',"</div>"].join("")),a.put("template/packery/packery-object.html",'<div class="packery-object" ng-transclude></div>')};angular.module("angular-packery",a).constant("packeryConfig",b).service("packeryService",["$rootScope","$q","$interval","$timeout","packeryConfig",c]).controller("PackeryController",["$rootScope","packeryConfig","packeryService",d]).directive("packery",["packeryConfig","packeryService",e]).directive("packeryObject",[f]).directive("packeryObject",[g]),angular.module("packeryTemplates",[]).run(["$templateCache",h])}();
\ No newline at end of file
+"use strict";!function(){var a=["packeryTemplates"],b={columnWidth:".packery-sizer",itemSelector:".packery-object",rowHeight:".packery-sizer",draggable:!0,handle:"*",timeout:2e3,acceptedAttributes:["containerStyle","columnWidth","gutter","isHorizontal","isInitLayout","isOriginLeft","isOriginTop","isResizeBound","itemSelector","rowHeight","transitionDuration"]},c=function(a,b,c,d,e){var f,g=[],h=function(a,b){for(var c=0;c<b.length;c++)if(b[c].id===a)return!1;return!0};return{Packery:function(i,j,k){var l=b.defer();if(j=j||void 0,k=k||{},h(i,g)&&void 0!==j)return f=new Packery(j[0],k),g.push({id:i,packery:f}),j.data("Packery",f),a.$emit("packeryInstantiated",f),f;var m=c(function(){void 0!==f&&(c.cancel(m),l.resolve(f))},e.timeout/10);return d(function(){c.cancel(m),l.reject(!1)},e.timeout),l.promise}}},d=function(a,b,c){var d=this;d.packeryInstantiated=!1,d.packeryDraggable=!1,d.dragHandle=void 0,d.uniqueId=(new Date).getTime(),d.packery={},this.bindDragEvents=function(a){var b,c,e;b=d.dragHandle,"*"===b?(e=new Draggabilly(a[0]),c=a):(e=new Draggabilly(a[0],{handle:b}),c=a[0].querySelectorAll(b)),d.packery.bindDraggabillyEvents(e),angular.element(c).on("mouseenter",function(){a.addClass("hovered")}).on("mouseleave",function(){a.removeClass("hovered")})},this.createAttrObj=function(a){for(var c={},d=b.acceptedAttributes,e=0;e<d.length;e++){var f=a[d[e]];void 0!==f&&(c[d[e]]="null"===f?null:isNaN(f)===!1?+a[d[e]]:a[d[e]])}return c},this.packObject=function(b){var e=c.Packery(d.uniqueId);e.then(function(){var c=d.packery.getItemElements();-1===c.indexOf(b[0])&&d.packery.appended(b[0]),d.packeryDraggable===!0&&d.bindDragEvents(b),b.css("visibility","visible"),a.$emit("packeryObjectPacked",b[0])})},this.setDraggable=function(a){d.packeryDraggable=!0,d.dragHandle=a}},e=function(a,b){return{restrict:"EAC",controller:"PackeryController",transclude:!0,replace:!0,templateUrl:"template/packery/packery.html",scope:{containerStyle:"=?",columnWidth:"@?",gutter:"@?",isHorizontal:"@?",isInitLayout:"@?",isOriginLeft:"@?",isOriginTop:"@?",isResizeBound:"@?",itemSelector:"@?",rowHeight:"@?",transitionDuration:"@?",draggable:"@?",handle:"@?"},link:function(c,d,e,f){var g,h,i;c.columnWidth=c.columnWidth||a.columnWidth,c.itemSelector=c.itemSelector||a.itemSelector,c.rowHeight=c.rowHeight||a.rowHeight,c.draggable=c.draggable||a.draggable,c.handle=c.handle||a.handle,"false"===c.draggable&&(c.draggable=!1),"false"===c.isHorizontal&&(c.isHorizontal=!1),"false"===c.isInitLayout&&(c.isInitLayout=!1),"false"===c.isOriginLeft&&(c.isOriginLeft=!1),"false"===c.isOriginTop&&(c.isOriginTop=!1),"false"===c.isResizeBound&&(c.isResizeBound=!1),c.containerStyle&&"object"==typeof c.containerStyle&&(c.containerStyle=c.containerStyle),c.draggable&&f.setDraggable(c.handle),g=f.createAttrObj(c),h=f.uniqueId,i=b.Packery(h,d,g),i instanceof Packery&&(f.packeryInstantiated=!0,f.packery=i)}}},f=function(){return{restrict:"EA",templateUrl:"template/packery/packery-object.html",transclude:!0,replace:!0}},g=function(){return{require:"^packery",restrict:"C",link:function(a,b,c,d){b.css("visibility","hidden"),d.packObject(b)}}},h=function(a){a.put("template/packery/packery.html",['<div class="packery-wrapper">','<div class="packery-sizer"></div>','<div class="packery-container" ng-transclude></div>',"</div>"].join("")),a.put("template/packery/packery-object.html",'<div class="packery-object" ng-transclude></div>')};angular.module("angular-packery",a).constant("packeryConfig",b).service("packeryService",["$rootScope","$q","$interval","$timeout","packeryConfig",c]).controller("PackeryController",["$rootScope","packeryConfig","packeryService",d]).directive("packery",["packeryConfig","packeryService",e]).directive("packeryObject",[f]).directive("packeryObject",[g]),angular.module("packeryTemplates",[]).run(["$templateCache",h])}();
\ No newline at end of file
diff --git a/package.json b/package.json
index 3fccfb5..8ee38b8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-packery",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "author": "http://github.com/sungard-labs/angular-packery/graphs/contributors",
   "homepage": "http://github.com/sungard-labs/angular-packery",
   "repository": {
@@ -29,7 +29,8 @@
     "grunt-banner": "~0.2.3"
   },
   "scripts": {
-    "postinstall": "bower install"
+    "postinstall": "bower install",
+    "test": "grunt test --verbose"
   },
   "license": "MIT"
 }
diff --git a/src/packery.js b/src/packery.js
index 0843c6c..64e4e90 100644
--- a/src/packery.js
+++ b/src/packery.js
@@ -59,7 +59,7 @@
           return packeryObj;
         } else {
           var interval = $interval(function(){
-            if (packeryObj !== undefined) { 
+            if (packeryObj !== undefined) {
               $interval.cancel(interval);
               deferred.resolve(packeryObj);
             }
@@ -69,7 +69,7 @@
             $interval.cancel(interval);
             deferred.reject(false);
           }, config.timeout);
-          
+
           return deferred.promise;
         }
       }
@@ -87,7 +87,7 @@
     self.packery = {};
 
     this.bindDragEvents = function(el) {
-      var handleSelector, handle, draggabilly;   
+      var handleSelector, handle, draggabilly;
 
       handleSelector = self.dragHandle;
 
@@ -150,7 +150,7 @@
 
         el.css('visibility','visible');
         $rootScope.$emit('packeryObjectPacked', el[0]);
-      });    
+      });
     };
 
     this.setDraggable = function (handle) {
@@ -160,17 +160,6 @@
   };
 
   var packeryDirective = function (config, service) {
-    
-    var createObject = function (str) {
-      try {
-        var obj = JSON.parse(JSON.stringify(eval('('+str+')')));
-        if (obj && typeof obj === "object") {
-          return obj;
-        }
-      }
-      catch (e) {}
-      return false;
-    };
 
     return {
       restrict: 'EAC',
@@ -179,7 +168,7 @@
       replace: true,
       templateUrl: 'template/packery/packery.html',
       scope: {
-        containerStyle: '@?', // Type: Object, null
+        containerStyle: '=?', // Type: Object, null
         columnWidth: '@?', // Type: Number, Selector String
         gutter: '@?', // Type: Number, Selector String
         isHorizontal: '@?', // Type: Boolean
@@ -195,7 +184,7 @@
         handle: '@?' // Type: Boolean
 
         // Let's come back to this one...
-        // stamp: '@?', 
+        // stamp: '@?',
       },
       link: function (scope, element, attrs, controller) {
 
@@ -218,7 +207,7 @@
         if (scope.isResizeBound === 'false') { scope.isResizeBound = false; }
 
         // Creates JS Object for passing CSS styles into Packery
-        if (scope.containerStyle) { scope.containerStyle = createObject(scope.containerStyle) };
+        if (scope.containerStyle && (typeof scope.containerStyle === 'object' )) { scope.containerStyle = scope.containerStyle; }
 
         // Set global draggability
         if (scope.draggable) { controller.setDraggable(scope.handle); }
@@ -256,7 +245,7 @@
         element.css('visibility','hidden');
 
         // Packs individual objects
-        controller.packObject(element);    
+        controller.packObject(element);
       }
     };
   };
@@ -264,7 +253,7 @@
   var packeryTemplates = function ($templateCache) {
     $templateCache
       .put('template/packery/packery.html', [
-        '<div class="packery-wrapper">', 
+        '<div class="packery-wrapper">',
           '<div class="packery-sizer"></div>',
           '<div class="packery-container" ng-transclude></div>',
         '</div>'