diff --git a/README.md b/README.md
index c7400e3..209326a 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,22 @@ Add optional on/off text
 </form>
 ```
 
+Add custom values for `ON` / `OFF` (if your model is not based on true/false values)
+```html
+<form>
+  <switch id="enabled" name="enabled" ng-model="enabled" on-value="ACTIVE" off-value="INACTIVE" class="green"></switch>
+  <br>{{ enabled }}
+</form>
+```
+
+Add a custom method to `on-click` event
+```html
+<form>
+  <switch id="enabled" name="enabled" ng-model="enabled" on-click-change="myMethod(with, args)" class="green"></switch>
+  <br>{{ enabled }}
+</form>
+```
+
 Disabled state
 ```html
 <form>
diff --git a/angular-ui-switch.js b/angular-ui-switch.js
index 9a6b591..6b77397 100644
--- a/angular-ui-switch.js
+++ b/angular-ui-switch.js
@@ -7,10 +7,26 @@ angular.module('uiSwitch', [])
   , transclude: true
   , template: function(element, attrs) {
       var html = '';
+      var extraMethod = '';
+
+      if (attrs.ngOnClick) {
+          extraMethod += '; ' + attrs.ngOnClick;
+      }
+      if (attrs.ngChange) {
+          extraMethod += '; ' + attrs.ngChange + '()';
+      }
+
       html += '<span';
       html +=   ' class="switch' + (attrs.class ? ' ' + attrs.class : '') + '"';
-      html +=   attrs.ngModel ? ' ng-click="' + attrs.disabled + ' ? ' + attrs.ngModel + ' : ' + attrs.ngModel + '=!' + attrs.ngModel + (attrs.ngChange ? '; ' + attrs.ngChange + '()"' : '"') : '';
-      html +=   ' ng-class="{ checked:' + attrs.ngModel + ', disabled:' + attrs.disabled + ' }"';
+
+      if (attrs.onValue && attrs.offValue) {
+          html += attrs.ngModel ? ' ng-click="' + attrs.disabled + ' ? ' + attrs.ngModel + ' : ' + attrs.ngModel + '=(' + attrs.ngModel + '=== \'' + (attrs.onValue || true) + '\' ? \'' + (attrs.offValue || false) + '\':\'' + (attrs.onValue || true) + '\')' + extraMethod + '"' : '';
+          html += ' ng-class="{ checked:' + attrs.ngModel + '===\'' + (attrs.onValue || true) + '\'?' + 'true' + ':' + 'false' + ', disabled:' + attrs.disabled + ' }"';
+      } else {
+          html += attrs.ngModel ? ' ng-click="' + attrs.disabled + ' ? ' + attrs.ngModel + ' : ' + attrs.ngModel + '=!' + attrs.ngModel + extraMethod +'"' : '';
+          html += ' ng-class="{ checked:' + attrs.ngModel + ', disabled:' + attrs.disabled + ' }"';
+      }
+
       html +=   '>';
       html +=   '<small></small>';
       html +=   '<input type="checkbox"';
diff --git a/angular-ui-switch.min.js b/angular-ui-switch.min.js
index 6f6da0f..b6bc81d 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.disabled+" ? "+e.ngModel+" : "+e.ngModel+"=!"+e.ngModel+(e.ngChange?"; "+e.ngChange+'()"':'"'):"",s+=' ng-class="{ checked:'+e.ngModel+", disabled:"+e.disabled+' }"',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:!0,transclude:!0,template:function(e,n){var l="",a="";return n.ngOnClick&&(a+="; "+n.ngOnClick),n.ngChange&&(a+="; "+n.ngChange+"()"),l+="<span",l+=' class="switch'+(n["class"]?" "+n["class"]:"")+'"',l+=n.ngModel?' ng-click="'+n.disabled+" ? "+n.ngModel+" : "+n.ngModel+"=!"+n.ngModel+(n.ngChange?"; "+n.ngChange+'()"':'"'):"",l+=' ng-class="{ checked:'+n.ngModel+", disabled:"+n.disabled+' }"',n.onValue&&n.offValue?(l+=n.ngModel?' ng-click="'+n.disabled+" ? "+n.ngModel+" : "+n.ngModel+"=("+n.ngModel+"=== '"+(n.onValue||!0)+"' ? '"+(n.offValue||!1)+"':'"+(n.onValue||!0)+"')"+a+'"':"",l+=' ng-class="{ checked:'+n.ngModel+"==='"+(n.onValue||!0)+"'?true:false, disabled:"+n.disabled+' }"'):(l+=n.ngModel?' ng-click="'+n.disabled+" ? "+n.ngModel+" : "+n.ngModel+"=!"+n.ngModel+a+'"':"",l+=' ng-class="{ checked:'+n.ngModel+", disabled:"+n.disabled+' }"'),l+=">",l+="<small></small>",l+='<input type="checkbox"',l+=n.id?' id="'+n.id+'"':"",l+=n.name?' name="'+n.name+'"':"",l+=n.ngModel?' ng-model="'+n.ngModel+'"':"",l+=' style="display:none" />',l+='<span class="switch-text">',l+=n.on?'<span class="on">'+n.on+"</span>":"",l+=n.off?'<span class="off">'+n.off+"</span>":" ",l+="</span>"}}});