diff --git a/dist/timer.jquery.js b/dist/timer.jquery.js
index b8c2c8b..068431e 100644
--- a/dist/timer.jquery.js
+++ b/dist/timer.jquery.js
@@ -62,7 +62,7 @@ function getDefaultConfig() {
 		repeat: false,				// This will repeat callback every n times duration is elapsed
 		countdown: false,			// If true, this will render the timer as a countdown (must have duration)
 		format: null,				// This sets the format in which the time will be printed
-		updateFrequency: 500		// How often should timer display update
+		updateFrequency: 500,		// How often should timer display update
 	};
 }
 
@@ -250,15 +250,16 @@ function intervalHandler(timerInstance) {
 	}
 
 	timerInstance.render();
+	
 	if (!timerInstance.config.duration) {
 		return;
 	}
 
 	// If the timer was called with a duration parameter,
-	// run the callback if duration is complete
+	// run the callback if duration is complete or total seconds is more than duration
 	// and remove the duration if `repeat` is not requested
 	if (timerInstance.totalSeconds > 0 &&
-		timerInstance.totalSeconds % timerInstance.config.duration === 0) {
+		(timerInstance.totalSeconds % timerInstance.config.duration === 0 || timerInstance.totalSeconds > timerInstance.config.duration )) {
 		if (timerInstance.config.callback) {
 			timerInstance.config.callback();
 		}
@@ -293,6 +294,7 @@ function Timer(element, config) {
 	this.originalConfig = $.extend({}, config);
 	this.totalSeconds = 0;
 	this.intervalId = null;
+	
 	// A HTML element will have the html() method in jQuery to inject content,
 	this.html = 'html';
 	if (element.tagName === 'INPUT' || element.tagName === 'TEXTAREA') {
@@ -423,4 +425,4 @@ $.fn.timer = function(options) {
 		}
 	});
 };
-} (jQuery));
\ No newline at end of file
+} (jQuery));
diff --git a/dist/timer.jquery.min.js b/dist/timer.jquery.min.js
index db5f275..1e53ab4 100644
--- a/dist/timer.jquery.min.js
+++ b/dist/timer.jquery.min.js
@@ -1 +1 @@
-!function(a){function b(a){var b;return a=a||0,b=Math.floor(a/60),{days:a>=n.DAYINSECONDS?Math.floor(a/n.DAYINSECONDS):0,hours:a>=3600?Math.floor(a%n.DAYINSECONDS/3600):0,totalMinutes:b,minutes:a>=60?Math.floor(a%3600/60):b,seconds:a%60,totalSeconds:a}}function c(a){return((a=parseInt(a,10))<10&&"0")+a}function d(){return{seconds:0,editable:!1,duration:null,callback:function(){console.log("Time up!")},repeat:!1,countdown:!1,format:null,updateFrequency:500}}function e(){return Math.round((Date.now?Date.now():(new Date).getTime())/1e3)}function f(a){var d=b(a);if(d.days)return d.days+":"+c(d.hours)+":"+c(d.minutes)+":"+c(d.seconds);if(d.hours)return d.hours+":"+c(d.minutes)+":"+c(d.seconds);return d.minutes?d.minutes+":"+c(d.seconds)+" min":d.seconds+" sec"}function g(a,d){for(var e=b(a),f=[{identifier:"%d",value:e.days},{identifier:"%h",value:e.hours},{identifier:"%m",value:e.minutes},{identifier:"%s",value:e.seconds},{identifier:"%g",value:e.totalMinutes},{identifier:"%t",value:e.totalSeconds},{identifier:"%D",value:c(e.days)},{identifier:"%H",value:c(e.hours)},{identifier:"%M",value:c(e.minutes)},{identifier:"%S",value:c(e.seconds)},{identifier:"%G",value:c(e.totalMinutes)},{identifier:"%T",value:c(e.totalSeconds)}],g=0;g<f.length;g++)d=d.replace(f[g].identifier,f[g].value);return d}function h(a){if(!isNaN(Number(a)))return a;a=a.toLowerCase();var b=a.match(/\d+d/),c=a.match(/\d+h/),d=a.match(/\d+m/),e=a.match(/\d+s/);if(!(b||c||d||e))throw new Error("Invalid string passed in durationTimeToSeconds!");var f=0;return b&&(f+=Number(b[0].replace("d",""))*n.DAYINSECONDS),c&&(f+=3600*Number(c[0].replace("h",""))),d&&(f+=60*Number(d[0].replace("m",""))),e&&(f+=Number(e[0].replace("s",""))),f}function i(a){var b,c;return a.indexOf("sec")>0?c=Number(a.replace(/\ssec/g,"")):a.indexOf("min")>0?(a=a.replace(/\smin/g,""),b=a.split(":"),c=Number(60*b[0])+Number(b[1])):a.match(/\d{1,2}:\d{2}:\d{2}:\d{2}/)?(b=a.split(":"),c=Number(b[0]*n.DAYINSECONDS)+Number(3600*b[1])+Number(60*b[2])+Number(b[3])):a.match(/\d{1,2}:\d{2}:\d{2}/)&&(b=a.split(":"),c=Number(3600*b[0])+Number(60*b[1])+Number(b[2])),c}function j(b,c){b.state=c,a(b.element).data("state",c)}function k(b){a(b.element).on("focus",function(){b.pause()}),a(b.element).on("blur",function(){b.totalSeconds=i(a(b.element)[b.html]()),b.resume()})}function l(b){if(b.totalSeconds=e()-b.startTime,b.config.countdown)return b.totalSeconds=b.config.duration-b.totalSeconds,0===b.totalSeconds&&(clearInterval(b.intervalId),j(b,n.TIMER_STOPPED),b.config.callback(),a(b.element).data("seconds")),void b.render();b.render(),b.config.duration&&b.totalSeconds>0&&b.totalSeconds%b.config.duration==0&&(b.config.callback&&b.config.callback(),b.config.repeat||(clearInterval(b.intervalId),j(b,n.TIMER_STOPPED),b.config.duration=null))}function m(b,c){if(this.element=b,this.originalConfig=a.extend({},c),this.totalSeconds=0,this.intervalId=null,this.html="html","INPUT"!==b.tagName&&"TEXTAREA"!==b.tagName||(this.html="val"),this.config=o.getDefaultConfig(),c.duration&&(c.duration=o.durationTimeToSeconds(c.duration)),"string"!=typeof c&&(this.config=a.extend(this.config,c)),this.config.seconds&&(this.totalSeconds=this.config.seconds),this.config.editable&&o.makeEditable(this),this.startTime=o.unixSeconds()-this.totalSeconds,this.config.duration&&this.config.repeat&&this.config.updateFrequency<1e3&&(this.config.updateFrequency=1e3),this.config.countdown){if(!this.config.duration)throw new Error("Countdown option set without duration!");if(this.config.editable)throw new Error("Cannot set editable on a countdown timer!");this.config.startTime=o.unixSeconds()-this.config.duration,this.totalSeconds=this.config.duration}}var n={PLUGIN_NAME:"timer",TIMER_RUNNING:"running",TIMER_PAUSED:"paused",TIMER_REMOVED:"removed",DAYINSECONDS:86400},o={getDefaultConfig:d,unixSeconds:e,secondsToPrettyTime:f,secondsToFormattedTime:g,durationTimeToSeconds:h,prettyTimeToSeconds:i,setState:j,makeEditable:k,intervalHandler:l};m.prototype.start=function(){this.state!==n.TIMER_RUNNING&&(o.setState(this,n.TIMER_RUNNING),this.render(),this.intervalId=setInterval(o.intervalHandler.bind(null,this),this.config.updateFrequency))},m.prototype.pause=function(){this.state===n.TIMER_RUNNING&&(o.setState(this,n.TIMER_PAUSED),clearInterval(this.intervalId))},m.prototype.resume=function(){this.state===n.TIMER_PAUSED&&(o.setState(this,n.TIMER_RUNNING),this.config.countdown?this.startTime=o.unixSeconds()-this.config.duration+this.totalSeconds:this.startTime=o.unixSeconds()-this.totalSeconds,this.intervalId=setInterval(o.intervalHandler.bind(null,this),this.config.updateFrequency))},m.prototype.remove=function(){clearInterval(this.intervalId),o.setState(this,n.TIMER_REMOVED),a(this.element).data(n.PLUGIN_NAME,null),a(this.element).data("seconds",null)},m.prototype.reset=function(){var b=this.originalConfig;this.remove(),a(this.element).timer(b)},m.prototype.render=function(){this.config.format?a(this.element)[this.html](o.secondsToFormattedTime(this.totalSeconds,this.config.format)):a(this.element)[this.html](o.secondsToPrettyTime(this.totalSeconds)),a(this.element).data("seconds",this.totalSeconds)},a.fn.timer=function(b){return b=b||"start",this.each(function(){a.data(this,n.PLUGIN_NAME)instanceof m||a.data(this,n.PLUGIN_NAME,new m(this,b));var c=a.data(this,n.PLUGIN_NAME);"string"==typeof b?"function"==typeof c[b]&&c[b]():c.start()})}}(jQuery);
\ No newline at end of file
+!function(n){var a={PLUGIN_NAME:"timer",TIMER_RUNNING:"running",TIMER_PAUSED:"paused",TIMER_REMOVED:"removed",DAYINSECONDS:86400};function s(t){var e;return t=t||0,e=Math.floor(t/60),{days:t>=a.DAYINSECONDS?Math.floor(t/a.DAYINSECONDS):0,hours:3600<=t?Math.floor(t%a.DAYINSECONDS/3600):0,totalMinutes:e,minutes:60<=t?Math.floor(t%3600/60):e,seconds:t%60,totalSeconds:t}}function r(t){return((t=parseInt(t,10))<10&&"0")+t}function e(){return Math.round((Date.now?Date.now():(new Date).getTime())/1e3)}function i(t){var e,n;return 0<t.indexOf("sec")?n=Number(t.replace(/\ssec/g,"")):0<t.indexOf("min")?(e=(t=t.replace(/\smin/g,"")).split(":"),n=Number(60*e[0])+Number(e[1])):t.match(/\d{1,2}:\d{2}:\d{2}:\d{2}/)?(e=t.split(":"),n=Number(e[0]*a.DAYINSECONDS)+Number(3600*e[1])+Number(60*e[2])+Number(e[3])):t.match(/\d{1,2}:\d{2}:\d{2}/)&&(e=t.split(":"),n=Number(3600*e[0])+Number(60*e[1])+Number(e[2])),n}function o(t,e){t.state=e,n(t.element).data("state",e)}var d={getDefaultConfig:function(){return{seconds:0,editable:!1,duration:null,callback:function(){console.log("Time up!")},repeat:!1,countdown:!1,format:null,updateFrequency:500}},unixSeconds:e,secondsToPrettyTime:function(t){var e=s(t);return e.days?e.days+":"+r(e.hours)+":"+r(e.minutes)+":"+r(e.seconds):e.hours?e.hours+":"+r(e.minutes)+":"+r(e.seconds):e.minutes?e.minutes+":"+r(e.seconds)+" min":e.seconds+" sec"},secondsToFormattedTime:function(t,e){for(var n=s(t),i=[{identifier:"%d",value:n.days},{identifier:"%h",value:n.hours},{identifier:"%m",value:n.minutes},{identifier:"%s",value:n.seconds},{identifier:"%g",value:n.totalMinutes},{identifier:"%t",value:n.totalSeconds},{identifier:"%D",value:r(n.days)},{identifier:"%H",value:r(n.hours)},{identifier:"%M",value:r(n.minutes)},{identifier:"%S",value:r(n.seconds)},{identifier:"%G",value:r(n.totalMinutes)},{identifier:"%T",value:r(n.totalSeconds)}],o=0;o<i.length;o++)e=e.replace(i[o].identifier,i[o].value);return e},durationTimeToSeconds:function(t){if(!isNaN(Number(t)))return t;var e=(t=t.toLowerCase()).match(/\d+d/),n=t.match(/\d+h/),i=t.match(/\d+m/),o=t.match(/\d+s/);if(!(e||n||i||o))throw new Error("Invalid string passed in durationTimeToSeconds!");var s=0;return e&&(s+=Number(e[0].replace("d",""))*a.DAYINSECONDS),n&&(s+=3600*Number(n[0].replace("h",""))),i&&(s+=60*Number(i[0].replace("m",""))),o&&(s+=Number(o[0].replace("s",""))),s},prettyTimeToSeconds:i,setState:o,makeEditable:function(t){n(t.element).on("focus",function(){t.pause()}),n(t.element).on("blur",function(){t.totalSeconds=i(n(t.element)[t.html]()),t.resume()})},intervalHandler:function(t){if(t.totalSeconds=e()-t.startTime,t.config.countdown)return t.totalSeconds=t.config.duration-t.totalSeconds,0===t.totalSeconds&&(clearInterval(t.intervalId),o(t,a.TIMER_STOPPED),t.config.callback(),n(t.element).data("seconds")),void t.render();t.render(),t.config.duration&&0<t.totalSeconds&&(t.totalSeconds%t.config.duration==0||t.totalSeconds>t.config.duration)&&(t.config.callback&&t.config.callback(),t.config.repeat||(clearInterval(t.intervalId),o(t,a.TIMER_STOPPED),t.config.duration=null))}};function c(t,e){if(this.element=t,this.originalConfig=n.extend({},e),this.totalSeconds=0,this.intervalId=null,this.html="html","INPUT"!==t.tagName&&"TEXTAREA"!==t.tagName||(this.html="val"),this.config=d.getDefaultConfig(),e.duration&&(e.duration=d.durationTimeToSeconds(e.duration)),"string"!=typeof e&&(this.config=n.extend(this.config,e)),this.config.seconds&&(this.totalSeconds=this.config.seconds),this.config.editable&&d.makeEditable(this),this.startTime=d.unixSeconds()-this.totalSeconds,this.config.duration&&this.config.repeat&&this.config.updateFrequency<1e3&&(this.config.updateFrequency=1e3),this.config.countdown){if(!this.config.duration)throw new Error("Countdown option set without duration!");if(this.config.editable)throw new Error("Cannot set editable on a countdown timer!");this.config.startTime=d.unixSeconds()-this.config.duration,this.totalSeconds=this.config.duration}}c.prototype.start=function(){this.state!==a.TIMER_RUNNING&&(d.setState(this,a.TIMER_RUNNING),this.render(),this.intervalId=setInterval(d.intervalHandler.bind(null,this),this.config.updateFrequency))},c.prototype.pause=function(){this.state===a.TIMER_RUNNING&&(d.setState(this,a.TIMER_PAUSED),clearInterval(this.intervalId))},c.prototype.resume=function(){this.state===a.TIMER_PAUSED&&(d.setState(this,a.TIMER_RUNNING),this.config.countdown?this.startTime=d.unixSeconds()-this.config.duration+this.totalSeconds:this.startTime=d.unixSeconds()-this.totalSeconds,this.intervalId=setInterval(d.intervalHandler.bind(null,this),this.config.updateFrequency))},c.prototype.remove=function(){clearInterval(this.intervalId),d.setState(this,a.TIMER_REMOVED),n(this.element).data(a.PLUGIN_NAME,null),n(this.element).data("seconds",null)},c.prototype.reset=function(){var t=this.originalConfig;this.remove(),n(this.element).timer(t)},c.prototype.render=function(){this.config.format?n(this.element)[this.html](d.secondsToFormattedTime(this.totalSeconds,this.config.format)):n(this.element)[this.html](d.secondsToPrettyTime(this.totalSeconds)),n(this.element).data("seconds",this.totalSeconds)},n.fn.timer=function(e){return e=e||"start",this.each(function(){n.data(this,a.PLUGIN_NAME)instanceof c||n.data(this,a.PLUGIN_NAME,new c(this,e));var t=n.data(this,a.PLUGIN_NAME);"string"==typeof e?"function"==typeof t[e]&&t[e]():t.start()})}}(jQuery);
diff --git a/package.json b/package.json
index 14c764d..bf4a8d4 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "timer.jquery",
   "description": "Start/Stop/Resume/Remove a pretty timer inside any HTML element.",
   "author": "Walmik Deshpande",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "repository": {
     "type": "git",
     "url": "git://github.com/walmik/timer.jquery.git"
diff --git a/src/Timer.js b/src/Timer.js
index bf31aa3..680e1c9 100644
--- a/src/Timer.js
+++ b/src/Timer.js
@@ -8,6 +8,7 @@ function Timer(element, config) {
 	this.originalConfig = $.extend({}, config);
 	this.totalSeconds = 0;
 	this.intervalId = null;
+	
 	// A HTML element will have the html() method in jQuery to inject content,
 	this.html = 'html';
 	if (element.tagName === 'INPUT' || element.tagName === 'TEXTAREA') {
diff --git a/src/utils.js b/src/utils.js
index 04c64f3..4cb8279 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -52,7 +52,7 @@ function getDefaultConfig() {
 		repeat: false,				// This will repeat callback every n times duration is elapsed
 		countdown: false,			// If true, this will render the timer as a countdown (must have duration)
 		format: null,				// This sets the format in which the time will be printed
-		updateFrequency: 500		// How often should timer display update
+		updateFrequency: 500,		// How often should timer display update
 	};
 }
 
@@ -227,7 +227,7 @@ function intervalHandler(timerInstance) {
 
 	if (timerInstance.config.countdown) {
 		timerInstance.totalSeconds = timerInstance.config.duration - timerInstance.totalSeconds;
-
+		
 		if (timerInstance.totalSeconds === 0) {
 			clearInterval(timerInstance.intervalId);
 			setState(timerInstance, Constants.TIMER_STOPPED);
@@ -240,15 +240,17 @@ function intervalHandler(timerInstance) {
 	}
 
 	timerInstance.render();
+	
 	if (!timerInstance.config.duration) {
 		return;
 	}
 
 	// If the timer was called with a duration parameter,
-	// run the callback if duration is complete
+	// run the callback if duration is complete or total seconds is more than duration
 	// and remove the duration if `repeat` is not requested
+	
 	if (timerInstance.totalSeconds > 0 &&
-		timerInstance.totalSeconds % timerInstance.config.duration === 0) {
+		(timerInstance.totalSeconds % timerInstance.config.duration === 0 || timerInstance.totalSeconds > timerInstance.config.duration )) {
 		if (timerInstance.config.callback) {
 			timerInstance.config.callback();
 		}