diff --git a/angular-ui-switch.js b/angular-ui-switch.js
index 4108863..baa39cd 100644
--- a/angular-ui-switch.js
+++ b/angular-ui-switch.js
@@ -3,12 +3,12 @@ angular.module('uiSwitch', [])
 .directive('switch', function(){
   return {
     restrict: 'AE'
-  , replace: true
+  , replace: false
   , transclude: true
   , template: function(element, attrs) {
       var html = '';
       html += '<span';
-      html +=   ' class="switch' + (attrs.class ? ' ' + attrs.class : '') + '"';
+      html +=   ' class="switch' + (attrs.className ? ' ' + attrs.className : '') + '"';;
       html +=   attrs.ngModel ? ' ng-click="' + attrs.ngModel + '=!' + attrs.ngModel + (attrs.ngChange ? '; ' + attrs.ngChange + '()"' : '"') : '';
       html +=   ' ng-class="{ checked:' + attrs.ngModel + ' }"';
       html +=   '>';
diff --git a/angular-ui-switch.min.js b/angular-ui-switch.min.js
index 8857b3a..8c8886c 100644
--- a/angular-ui-switch.min.js
+++ b/angular-ui-switch.min.js
@@ -1 +1 @@
-angular.module("uiSwitch",[]).directive("switch",function(){return{restrict:"AE",replace:!0,transclude:!0,template:function(n,e){var s="";return s+="<span",s+=' class="switch'+(e.class?" "+e.class:"")+'"',s+=e.ngModel?' ng-click="'+e.ngModel+"=!"+e.ngModel+(e.ngChange?"; "+e.ngChange+'()"':'"'):"",s+=' ng-class="{ checked:'+e.ngModel+' }"',s+=">",s+="<small></small>",s+='<input type="checkbox"',s+=e.id?' id="'+e.id+'"':"",s+=e.name?' name="'+e.name+'"':"",s+=e.ngModel?' ng-model="'+e.ngModel+'"':"",s+=' style="display:none" />',s+='<span class="switch-text">',s+=e.on?'<span class="on">'+e.on+"</span>":"",s+=e.off?'<span class="off">'+e.off+"</span>":" ",s+="</span>"}}});
\ No newline at end of file
+angular.module("uiSwitch",[]).directive("switch",function(){return{restrict:"AE",replace:false,transclude:true,template:function(c,a){var b="";b+="<span";b+=' class="switch'+(a.className?" "+a.className:"")+'"';b+=a.ngModel?' ng-click="'+a.ngModel+"=!"+a.ngModel+(a.ngChange?"; "+a.ngChange+'()"':'"'):"";b+=' ng-class="{ checked:'+a.ngModel+' }"';b+=">";b+="<small></small>";b+='<input type="checkbox"';b+=a.id?' id="'+a.id+'"':"";b+=a.name?' name="'+a.name+'"':"";b+=a.ngModel?' ng-model="'+a.ngModel+'"':"";b+=' style="display:none" />';b+='<span class="switch-text">';b+=a.on?'<span class="on">'+a.on+"</span>":"";b+=a.off?'<span class="off">'+a.off+"</span>":" ";b+="</span>";return b}}});
\ No newline at end of file