diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b512c09
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+node_modules
\ No newline at end of file
diff --git a/README.md b/README.md
index becdc50..22046b5 100644
--- a/README.md
+++ b/README.md
@@ -12,3 +12,19 @@ Example usage:
         $('.msg').prepareTransition().toggleClass('hidden');
     });
 
+Example CSS:
+	
+	.examplepanel {
+	    opacity: 1;
+	    transition: opacity 1s;
+	    display: block;
+	}
+
+	.is-shown .examplepanel {
+		opacity: 0;
+		display: none;
+	}
+
+	.examplepanel.is-transitioning {
+		display: block !important;
+	}
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
new file mode 100644
index 0000000..f7d5569
--- /dev/null
+++ b/gulpfile.js
@@ -0,0 +1,10 @@
+var gulp = require('gulp'),
+	rename = require('gulp-rename'),
+	uglify = require('gulp-uglify');
+
+gulp.task('default', function() {
+	return gulp.src("./preparetransition.js")
+		.pipe(uglify())
+		.pipe(rename("preparetransition.min.js"))
+		.pipe(gulp.dest('./'))
+});
\ No newline at end of file
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..37b99e9
--- /dev/null
+++ b/package.json
@@ -0,0 +1,29 @@
+{
+  "name": "prepare-transition",
+  "version": "0.1.1",
+  "description": "The prepareTransition plugin sets display and visibility to override any existing display and visibility properties.",
+  "main": "gulpfile.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/snookca/prepareTransition.git"
+  },
+  "keywords": [
+    "css",
+    "transition",
+    "jquery"
+  ],
+  "author": "jonathan@snook.ca",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/snookca/prepareTransition/issues"
+  },
+  "homepage": "https://github.com/snookca/prepareTransition#readme",
+  "devDependencies": {
+    "gulp": "^3.9.0",
+    "gulp-rename": "^1.2.2",
+    "gulp-uglify": "^1.2.0"
+  }
+}
diff --git a/preparetransition.js b/preparetransition.js
index e5e6517..eeeedf2 100644
--- a/preparetransition.js
+++ b/preparetransition.js
@@ -18,13 +18,102 @@
 
 (function($){
 
-$.fn.prepareTransition = function(){
+    // Checks if transitions are supported
+    function supportsTransitions() {
+        var b = document.body || document.documentElement,
+            s = b.style,
+            p = 'transition';
+
+        if (typeof s[p] == 'string') { return true; }
+
+        // Tests for vendor specific prop
+        var v = ['Moz', 'webkit', 'Webkit', 'Khtml', 'O', 'ms'];
+        p = p.charAt(0).toUpperCase() + p.substr(1);
+
+        for (var i=0; i<v.length; i++) {
+            if (typeof s[v[i] + p] == 'string') { return true; }
+        }
+
+        return false;
+    }
+
+    // gets the CSS & JS name of the 'transform' property, which can vary from browser to browser
+    function getTransformName() {
+        var st = window.getComputedStyle(document.body, null);
+
+        var rtnObj = {
+            css: null, js: null
+        }
+        
+        if( st.getPropertyValue("transform") !== null ) {
+            rtnObj.css = "transform";
+            rtnObj.js = "transform";
+            return rtnObj;
+        }
+
+        if( st.getPropertyValue("-webkit-transform") !== null ) {
+            rtnObj.css = "-webkit-transform";
+            rtnObj.js = "webkitTransform";
+            return rtnObj;
+        }
+
+        if( st.getPropertyValue("-moz-transform") !== null )    {
+            rtnObj.css = "-moz-transform";
+            rtnObj.js = "MozTransform";
+            return rtnObj;
+        }
+        
+        if( st.getPropertyValue("-ms-transform") !== null ) {
+            rtnObj.css = "-ms-transform";
+            rtnObj.js = "msTransform";
+            return rtnObj;
+        }
+        
+        if( st.getPropertyValue("-o-transform") !== null ) {
+            rtnObj.css = "-o-transform";
+            rtnObj.js = "OTransform";
+            return rtnObj;
+        }
+        
+        return null;
+    }
+
+/**
+ * @param property {string} optional - If passed transition end events will only look for events with this property type. This is useful when avoiding multiple transition events on the same element or it's children.
+ */
+$.fn.prepareTransition = function( property ){
+    var hasTrans = supportsTransitions();
+
+    if(property === "transform") property = getTransformName().css;
+
     return this.each(function(){
         var el = $(this);
-        // remove the transition class upon completion
-        el.one('TransitionEnd webkitTransitionEnd transitionend oTransitionEnd', function(){
-            el.removeClass('is-transitioning');
-        });
+        
+        if( hasTrans ) {
+            var evtFired = false;
+
+            // Need to add MS events as well?
+
+            // remove the transition class upon completion (don't ise $.one, incase multiple properties transitioning)
+            el.on('TransitionEnd webkitTransitionEnd transitionend oTransitionEnd', function(evt){
+
+                // just triggers for one property type (if specified)
+                if( property && evt.originalEvent.propertyName !== property ) return;
+
+                // stops multiple events triggering
+                if(!evtFired) {
+                    evtFired = true;
+                    el.removeClass('is-transitioning');
+
+                    // Need to add MS events as well?
+                    $(this).off('TransitionEnd webkitTransitionEnd transitionend oTransitionEnd');
+                }
+            });
+        } else {
+            el.addClass('hasnt-transition');
+        }
+
+        // Don't we need to add MS events as well?
 
         // check the various CSS properties to see if a duration has been set
         var cl = ["transition-duration", "-moz-transition-duration", "-webkit-transition-duration", "-o-transition-duration"];
@@ -33,14 +122,14 @@ $.fn.prepareTransition = function(){
             duration || (duration = parseFloat( el.css( itm ) ));
         });
 
+        // Should really add delay here as well, right?
+
         // if I have a duration then add the class
         if (duration != 0) {
-            el.addClass('is-transitioning');
+            if( hasTrans ) el.addClass('is-transitioning');
             el[0].offsetWidth; // check offsetWidth to force the style rendering
         };
     });
 };
 
-
 }(jQuery));
-
diff --git a/preparetransition.min.js b/preparetransition.min.js
index 24f2a4f..fca0141 100644
--- a/preparetransition.min.js
+++ b/preparetransition.min.js
@@ -1,2 +1 @@
-/* Jonathan Snook - MIT License - https://github.com/snookca/prepareTransition */
-(function(a){a.fn.prepareTransition=function(){return this.each(function(){var b=a(this);b.one("TransitionEnd webkitTransitionEnd transitionend oTransitionEnd",function(){b.removeClass("is-transitioning")});var c=["transition-duration","-moz-transition-duration","-webkit-transition-duration","-o-transition-duration"];var d=0;a.each(c,function(a,c){d=parseFloat(b.css(c))||d});if(d!=0){b.addClass("is-transitioning");b[0].offsetWidth}})}})(jQuery)
+!function(n){function t(){var n=document.body||document.documentElement,t=n.style,r="transition";if("string"==typeof t[r])return!0;var s=["Moz","webkit","Webkit","Khtml","O","ms"];r=r.charAt(0).toUpperCase()+r.substr(1);for(var o=0;o<s.length;o++)if("string"==typeof t[s[o]+r])return!0;return!1}function r(){var n=window.getComputedStyle(document.body,null),t={css:null,js:null};return null!==n.getPropertyValue("transform")?(t.css="transform",t.js="transform",t):null!==n.getPropertyValue("-webkit-transform")?(t.css="-webkit-transform",t.js="webkitTransform",t):null!==n.getPropertyValue("-moz-transform")?(t.css="-moz-transform",t.js="MozTransform",t):null!==n.getPropertyValue("-ms-transform")?(t.css="-ms-transform",t.js="msTransform",t):null!==n.getPropertyValue("-o-transform")?(t.css="-o-transform",t.js="OTransform",t):null}n.fn.prepareTransition=function(s){var o=t();return"transform"===s&&(s=r().css),this.each(function(){var t=n(this);if(o){var r=!1;t.on("TransitionEnd webkitTransitionEnd transitionend oTransitionEnd",function(o){s&&o.originalEvent.propertyName!==s||r||(r=!0,t.removeClass("is-transitioning"),n(this).off("TransitionEnd webkitTransitionEnd transitionend oTransitionEnd"))})}else t.addClass("hasnt-transition");var i=["transition-duration","-moz-transition-duration","-webkit-transition-duration","-o-transition-duration"],a=0;n.each(i,function(n,r){a||(a=parseFloat(t.css(r)))}),0!=a&&(o&&t.addClass("is-transitioning"),t[0].offsetWidth)})}}(jQuery);
\ No newline at end of file