diff --git a/Gruntfile.js b/Gruntfile.js
index 6d5153e..2057c7e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -82,7 +82,7 @@ module.exports = function(grunt) {
 		bumpup: ['component.json', '<%= pkg.name %>.jquery.json'],
 
 		// Commit changes and tag the latest commit with a version from JSON file.
-		tagrelease: ['component.json']
+		tagrelease: 'component.json'
 	});
 
 	// These plugins provide necessary tasks.
diff --git a/component.json b/component.json
index 10e25bf..ac9c499 100644
--- a/component.json
+++ b/component.json
@@ -2,8 +2,8 @@
 	"name": "motio",
 	"title": "Motio",
 	"description": "Sprite based animations and panning.",
-	"version": "2.0.0",
-	"date": "2013-04-05 17:09:39 +00:00",
+	"version": "2.0.1",
+	"date": "2013-04-05 19:14:14 +00:00",
 	"homepage": "https://github.com/Darsain/motio",
 	"main": "./dist/motio.js",
 	"bugs": "https://github.com/Darsain/motio/issues",
diff --git a/dist/jquery.motio.js b/dist/jquery.motio.js
index 3f04134..95c8296 100644
--- a/dist/jquery.motio.js
+++ b/dist/jquery.motio.js
@@ -135,8 +135,7 @@
 		 * @return {Object} Motio instance.
 		 */
 		self.toStart = function (immediate, callback) {
-			self.to(0, immediate, callback);
-			return self;
+			return self.to(0, immediate, callback);
 		};
 
 		/**
@@ -148,8 +147,7 @@
 		 * @return {Object} Motio instance.
 		 */
 		self.toEnd = function (immediate, callback) {
-			self.to(frames.length - 1, immediate, callback);
-			return self;
+			return self.to(frames.length - 1, immediate, callback);
 		};
 
 		/**
@@ -163,7 +161,7 @@
 		 */
 		self.to = function (frame, immediate, callback) {
 			if (isPan || !isNumber(frame) || frame < 0 || frame >= frames.length) {
-				return;
+				return self;
 			}
 
 			// Handle optional argument
@@ -183,7 +181,7 @@
 						callback.call(self);
 					}
 					self.pause();
-					return;
+					return self;
 				}
 			}
 
@@ -195,6 +193,8 @@
 
 			// Resume rendering if paused
 			resume();
+
+			return self;
 		};
 
 		/**
@@ -521,9 +521,6 @@
 		speedY:   0, // Vertical panning speed in pixels per second.
 		bgWidth:  0, // Width of the background image (optional).
 		bgHeight: 0  // Height of the background image (optional).
-			// it is needed so the script will know when to reset the background position to 0, and thus not overflow the JavaScript 2^53 integer limit
-			// when 0 (=unknown), the position will iterate into ridiculous numbers, which will in a few million years result into a buggy animation ...
-			// you basically set this if you have OCD
 	};
 })(window);
 /*global Motio */
diff --git a/dist/jquery.motio.min.js b/dist/jquery.motio.min.js
index 4c6c828..0352891 100644
--- a/dist/jquery.motio.min.js
+++ b/dist/jquery.motio.min.js
@@ -1,8 +1,8 @@
 /*! Motio 2.0.0 - 5th Apr 2013 | https://github.com/Darsain/motio */
 (function(l){function j(b,t){function G(c){d.reversed=c;v||(a.isPaused=0,A("play"),D())}function x(){y=0;E=B?Math.round(h.x)+"px "+Math.round(h.y)+"px":q[m];E!==H&&(b.style.backgroundPosition=H=E);A("frame");d.finite&&d.to===m&&(a.pause(),"function"===r(d.callback)&&d.callback.call(a))}function D(){d.finite&&d.to===m||(B?(h.x+=f.speedX/f.fps,h.y+=f.speedY/f.fps,f.bgWidth&&Math.abs(h.x)>f.bgWidth&&(h.x%=f.bgWidth),f.bgHeight&&Math.abs(h.y)>f.bgHeight&&(h.y%=f.bgHeight)):(d.finite?m=d.immediate?d.to:
 m+(m>d.to?-1:1):d.reversed?0>=--m&&(m=q.length-1):++m>=q.length&&(m=0),a.frame=m),d.immediate||(v=60<=f.fps?w(D):setTimeout(D,1E3/f.fps)),y||(y=w(x)))}function I(a,g){s=0;for(C=n[a].length;s<C;s++)if(n[a][s]===g)return s;return-1}function A(c,g){if(n[c]){s=0;for(C=n[c].length;s<C;s++)n[c][s].call(a,c,g)}}function F(a){return l.getComputedStyle?l.getComputedStyle(b,null)[a]:b.currentStyle[a]}var f,u=t,z={},u="object"===r(u)?u:{},p;for(p in j.defaults)z[p]=(u.hasOwnProperty(p)?u:j.defaults)[p];f=z;
-var a=this,B=!f.frames,q=[],n={},d={},m=0,u=b.clientWidth,z=b.clientHeight,h,E,H,v,y,s,C;a.width=u;a.height=z;a.options=f;a.isPaused=1;a.pause=function(){v&&(a.isPaused=1,k(v),v=clearTimeout(v),y=k(y),A("pause"));return a};a.play=function(c){d.finite=0;d.callback=0;G(c);return a};a.toggle=function(){A("toggle");a[v?"pause":"play"]();return a};a.toStart=function(c,g){a.to(0,c,g);return a};a.toEnd=function(c,g){a.to(q.length-1,c,g);return a};a.to=function(c,g,e){if(!B&&!isNaN(parseFloat(c))&&isFinite(c)&&
-!(0>c||c>=q.length)){"function"===r(g)&&(e=g,g=!1);if(c===m)if(0===c)m=q.length;else if(c===q.length-1)m=-1;else{"function"===r(e)&&e.call(a);a.pause();return}d.finite=1;d.to=c;d.immediate=g;d.callback=e;G()}};a.set=function(c,g){f[c]=g;return a};a.on=function(c,g){if("object"===r(c))for(var e in c){if(c.hasOwnProperty(e))a.on(e,c[e])}else if("function"===r(g)){e=c.split(" ");for(var b=0,d=e.length;b<d;b++)n[e[b]]=n[e[b]]||[],-1===I(e[b],g)&&n[e[b]].push(g)}else if("array"===r(g)){e=0;for(b=g.length;e<
-b;e++)a.on(c,g[e])}return a};a.off=function(c,b){if(b instanceof Array)for(var e=0,d=b.length;e<d;e++)a.off(c,b[e]);else for(var e=c.split(" "),d=0,h=e.length;d<h;d++)if(n[e[d]]=n[e[d]]||[],"undefined"===r(b))n[e[d]].length=0;else{var f=I(e[d],b);-1!==f&&n[e[d]].splice(f,1)}return a};a.destroy=function(){a.pause();b.style.backgroundPosition="";return a};p=(F("backgroundPosition")||F("backgroundPositionX")+" "+F("backgroundPositionY")).replace(/left|top/gi,0).split(" ");h={x:0|parseInt(p[0],10),y:0|
-parseInt(p[1],10)};if(B)a.pos=h;else{for(p=q.length=0;p<f.frames;p++)f.vertical?h.y=p*-z:h.x=p*-u,q.push(h.x+"px "+h.y+"px");a.frames=q.length;a.frame=0}}function r(b){return Object.prototype.toString.call(b).match(/\s([a-z]+)/i)[1].toLowerCase()}for(var k=l.cancelAnimationFrame||l.cancelRequestAnimationFrame,w=l.requestAnimationFrame,x=["moz","webkit","o"],t=0,b=0,J=x.length;b<J&&!k;++b)w=(k=l[x[b]+"CancelAnimationFrame"]||l[x[b]+"CancelRequestAnimationFrame"])&&l[x[b]+"RequestAnimationFrame"];k||
-(w=function(b){var j=+new Date,k=Math.max(0,16-(j-t));t=j+k;return l.setTimeout(function(){b(j+k)},k)},k=function(b){clearTimeout(b)});l.Motio=j;j.defaults={fps:15,frames:0,vertical:0,speedX:0,speedY:0,bgWidth:0,bgHeight:0}})(window);(function(l){l.fn.motio=function(j,r){var k,w;if(!l.isPlainObject(j)){if("string"===typeof j||!1===j)k=!1===j?"destroy":j,w=Array.prototype.slice.call(arguments,1);j={}}return this.each(function(x,t){var b=l.data(t,"motio");!b&&!k?(b=l.data(t,"motio",new Motio(t,j)),b.on(r),j.startPaused||b.play()):b&&k&&(b[k]&&b[k].apply(b,w),"destroy"===k&&l.removeData(t,"motio"))})}})(jQuery);
+var a=this,B=!f.frames,q=[],n={},d={},m=0,u=b.clientWidth,z=b.clientHeight,h,E,H,v,y,s,C;a.width=u;a.height=z;a.options=f;a.isPaused=1;a.pause=function(){v&&(a.isPaused=1,k(v),v=clearTimeout(v),y=k(y),A("pause"));return a};a.play=function(c){d.finite=0;d.callback=0;G(c);return a};a.toggle=function(){A("toggle");a[v?"pause":"play"]();return a};a.toStart=function(c,g){return a.to(0,c,g)};a.toEnd=function(c,g){return a.to(q.length-1,c,g)};a.to=function(c,g,e){if(B||isNaN(parseFloat(c))||!isFinite(c)||
+0>c||c>=q.length)return a;"function"===r(g)&&(e=g,g=!1);if(c===m)if(0===c)m=q.length;else if(c===q.length-1)m=-1;else return"function"===r(e)&&e.call(a),a.pause(),a;d.finite=1;d.to=c;d.immediate=g;d.callback=e;G();return a};a.set=function(c,g){f[c]=g;return a};a.on=function(c,g){if("object"===r(c))for(var e in c){if(c.hasOwnProperty(e))a.on(e,c[e])}else if("function"===r(g)){e=c.split(" ");for(var b=0,d=e.length;b<d;b++)n[e[b]]=n[e[b]]||[],-1===I(e[b],g)&&n[e[b]].push(g)}else if("array"===r(g)){e=
+0;for(b=g.length;e<b;e++)a.on(c,g[e])}return a};a.off=function(c,b){if(b instanceof Array)for(var e=0,d=b.length;e<d;e++)a.off(c,b[e]);else for(var e=c.split(" "),d=0,h=e.length;d<h;d++)if(n[e[d]]=n[e[d]]||[],"undefined"===r(b))n[e[d]].length=0;else{var f=I(e[d],b);-1!==f&&n[e[d]].splice(f,1)}return a};a.destroy=function(){a.pause();b.style.backgroundPosition="";return a};p=(F("backgroundPosition")||F("backgroundPositionX")+" "+F("backgroundPositionY")).replace(/left|top/gi,0).split(" ");h={x:0|parseInt(p[0],
+10),y:0|parseInt(p[1],10)};if(B)a.pos=h;else{for(p=q.length=0;p<f.frames;p++)f.vertical?h.y=p*-z:h.x=p*-u,q.push(h.x+"px "+h.y+"px");a.frames=q.length;a.frame=0}}function r(b){return Object.prototype.toString.call(b).match(/\s([a-z]+)/i)[1].toLowerCase()}for(var k=l.cancelAnimationFrame||l.cancelRequestAnimationFrame,w=l.requestAnimationFrame,x=["moz","webkit","o"],t=0,b=0,J=x.length;b<J&&!k;++b)w=(k=l[x[b]+"CancelAnimationFrame"]||l[x[b]+"CancelRequestAnimationFrame"])&&l[x[b]+"RequestAnimationFrame"];
+k||(w=function(b){var j=+new Date,k=Math.max(0,16-(j-t));t=j+k;return l.setTimeout(function(){b(j+k)},k)},k=function(b){clearTimeout(b)});l.Motio=j;j.defaults={fps:15,frames:0,vertical:0,speedX:0,speedY:0,bgWidth:0,bgHeight:0}})(window);(function(l){l.fn.motio=function(j,r){var k,w;if(!l.isPlainObject(j)){if("string"===typeof j||!1===j)k=!1===j?"destroy":j,w=Array.prototype.slice.call(arguments,1);j={}}return this.each(function(x,t){var b=l.data(t,"motio");!b&&!k?(b=l.data(t,"motio",new Motio(t,j)),b.on(r),j.startPaused||b.play()):b&&k&&(b[k]&&b[k].apply(b,w),"destroy"===k&&l.removeData(t,"motio"))})}})(jQuery);
diff --git a/dist/motio.js b/dist/motio.js
index ce32e65..e531c99 100644
--- a/dist/motio.js
+++ b/dist/motio.js
@@ -135,8 +135,7 @@
 		 * @return {Object} Motio instance.
 		 */
 		self.toStart = function (immediate, callback) {
-			self.to(0, immediate, callback);
-			return self;
+			return self.to(0, immediate, callback);
 		};
 
 		/**
@@ -148,8 +147,7 @@
 		 * @return {Object} Motio instance.
 		 */
 		self.toEnd = function (immediate, callback) {
-			self.to(frames.length - 1, immediate, callback);
-			return self;
+			return self.to(frames.length - 1, immediate, callback);
 		};
 
 		/**
@@ -163,7 +161,7 @@
 		 */
 		self.to = function (frame, immediate, callback) {
 			if (isPan || !isNumber(frame) || frame < 0 || frame >= frames.length) {
-				return;
+				return self;
 			}
 
 			// Handle optional argument
@@ -183,7 +181,7 @@
 						callback.call(self);
 					}
 					self.pause();
-					return;
+					return self;
 				}
 			}
 
@@ -195,6 +193,8 @@
 
 			// Resume rendering if paused
 			resume();
+
+			return self;
 		};
 
 		/**
@@ -521,8 +521,5 @@
 		speedY:   0, // Vertical panning speed in pixels per second.
 		bgWidth:  0, // Width of the background image (optional).
 		bgHeight: 0  // Height of the background image (optional).
-			// it is needed so the script will know when to reset the background position to 0, and thus not overflow the JavaScript 2^53 integer limit
-			// when 0 (=unknown), the position will iterate into ridiculous numbers, which will in a few million years result into a buggy animation ...
-			// you basically set this if you have OCD
 	};
 })(window);
\ No newline at end of file
diff --git a/dist/motio.min.js b/dist/motio.min.js
index 1124859..470dc79 100644
--- a/dist/motio.min.js
+++ b/dist/motio.min.js
@@ -1,8 +1,8 @@
 /*! Motio 2.0.0 - 5th Apr 2013 | https://github.com/Darsain/motio */
 (function(n){function z(p,m){function H(c){b.reversed=c;t||(a.isPaused=0,A("play"),E())}function v(){w=0;F=B?Math.round(d.x)+"px "+Math.round(d.y)+"px":q[h];F!==I&&(p.style.backgroundPosition=I=F);A("frame");b.finite&&b.to===h&&(a.pause(),"function"===j(b.callback)&&b.callback.call(a))}function E(){b.finite&&b.to===h||(B?(d.x+=g.speedX/g.fps,d.y+=g.speedY/g.fps,g.bgWidth&&Math.abs(d.x)>g.bgWidth&&(d.x%=g.bgWidth),g.bgHeight&&Math.abs(d.y)>g.bgHeight&&(d.y%=g.bgHeight)):(b.finite?h=b.immediate?b.to:
 h+(h>b.to?-1:1):b.reversed?0>=--h&&(h=q.length-1):++h>=q.length&&(h=0),a.frame=h),b.immediate||(t=60<=g.fps?C(E):setTimeout(E,1E3/g.fps)),w||(w=C(v)))}function y(a,f){r=0;for(D=k[a].length;r<D;r++)if(k[a][r]===f)return r;return-1}function A(c,f){if(k[c]){r=0;for(D=k[c].length;r<D;r++)k[c][r].call(a,c,f)}}function G(a){return n.getComputedStyle?n.getComputedStyle(p,null)[a]:p.currentStyle[a]}var g,s=m,x={},s="object"===j(s)?s:{},l;for(l in z.defaults)x[l]=(s.hasOwnProperty(l)?s:z.defaults)[l];g=x;
-var a=this,B=!g.frames,q=[],k={},b={},h=0,s=p.clientWidth,x=p.clientHeight,d,F,I,t,w,r,D;a.width=s;a.height=x;a.options=g;a.isPaused=1;a.pause=function(){t&&(a.isPaused=1,u(t),t=clearTimeout(t),w=u(w),A("pause"));return a};a.play=function(c){b.finite=0;b.callback=0;H(c);return a};a.toggle=function(){A("toggle");a[t?"pause":"play"]();return a};a.toStart=function(c,f){a.to(0,c,f);return a};a.toEnd=function(c,f){a.to(q.length-1,c,f);return a};a.to=function(c,f,e){if(!B&&!isNaN(parseFloat(c))&&isFinite(c)&&
-!(0>c||c>=q.length)){"function"===j(f)&&(e=f,f=!1);if(c===h)if(0===c)h=q.length;else if(c===q.length-1)h=-1;else{"function"===j(e)&&e.call(a);a.pause();return}b.finite=1;b.to=c;b.immediate=f;b.callback=e;H()}};a.set=function(c,f){g[c]=f;return a};a.on=function(c,f){if("object"===j(c))for(var e in c){if(c.hasOwnProperty(e))a.on(e,c[e])}else if("function"===j(f)){e=c.split(" ");for(var b=0,d=e.length;b<d;b++)k[e[b]]=k[e[b]]||[],-1===y(e[b],f)&&k[e[b]].push(f)}else if("array"===j(f)){e=0;for(b=f.length;e<
-b;e++)a.on(c,f[e])}return a};a.off=function(c,b){if(b instanceof Array)for(var e=0,d=b.length;e<d;e++)a.off(c,b[e]);else for(var e=c.split(" "),d=0,g=e.length;d<g;d++)if(k[e[d]]=k[e[d]]||[],"undefined"===j(b))k[e[d]].length=0;else{var h=y(e[d],b);-1!==h&&k[e[d]].splice(h,1)}return a};a.destroy=function(){a.pause();p.style.backgroundPosition="";return a};l=(G("backgroundPosition")||G("backgroundPositionX")+" "+G("backgroundPositionY")).replace(/left|top/gi,0).split(" ");d={x:0|parseInt(l[0],10),y:0|
-parseInt(l[1],10)};if(B)a.pos=d;else{for(l=q.length=0;l<g.frames;l++)g.vertical?d.y=l*-x:d.x=l*-s,q.push(d.x+"px "+d.y+"px");a.frames=q.length;a.frame=0}}function j(p){return Object.prototype.toString.call(p).match(/\s([a-z]+)/i)[1].toLowerCase()}for(var u=n.cancelAnimationFrame||n.cancelRequestAnimationFrame,C=n.requestAnimationFrame,v=["moz","webkit","o"],y=0,m=0,J=v.length;m<J&&!u;++m)C=(u=n[v[m]+"CancelAnimationFrame"]||n[v[m]+"CancelRequestAnimationFrame"])&&n[v[m]+"RequestAnimationFrame"];u||
-(C=function(p){var j=+new Date,m=Math.max(0,16-(j-y));y=j+m;return n.setTimeout(function(){p(j+m)},m)},u=function(j){clearTimeout(j)});n.Motio=z;z.defaults={fps:15,frames:0,vertical:0,speedX:0,speedY:0,bgWidth:0,bgHeight:0}})(window);
+var a=this,B=!g.frames,q=[],k={},b={},h=0,s=p.clientWidth,x=p.clientHeight,d,F,I,t,w,r,D;a.width=s;a.height=x;a.options=g;a.isPaused=1;a.pause=function(){t&&(a.isPaused=1,u(t),t=clearTimeout(t),w=u(w),A("pause"));return a};a.play=function(c){b.finite=0;b.callback=0;H(c);return a};a.toggle=function(){A("toggle");a[t?"pause":"play"]();return a};a.toStart=function(c,f){return a.to(0,c,f)};a.toEnd=function(c,f){return a.to(q.length-1,c,f)};a.to=function(c,f,e){if(B||isNaN(parseFloat(c))||!isFinite(c)||
+0>c||c>=q.length)return a;"function"===j(f)&&(e=f,f=!1);if(c===h)if(0===c)h=q.length;else if(c===q.length-1)h=-1;else return"function"===j(e)&&e.call(a),a.pause(),a;b.finite=1;b.to=c;b.immediate=f;b.callback=e;H();return a};a.set=function(c,f){g[c]=f;return a};a.on=function(c,f){if("object"===j(c))for(var e in c){if(c.hasOwnProperty(e))a.on(e,c[e])}else if("function"===j(f)){e=c.split(" ");for(var b=0,d=e.length;b<d;b++)k[e[b]]=k[e[b]]||[],-1===y(e[b],f)&&k[e[b]].push(f)}else if("array"===j(f)){e=
+0;for(b=f.length;e<b;e++)a.on(c,f[e])}return a};a.off=function(c,b){if(b instanceof Array)for(var e=0,d=b.length;e<d;e++)a.off(c,b[e]);else for(var e=c.split(" "),d=0,g=e.length;d<g;d++)if(k[e[d]]=k[e[d]]||[],"undefined"===j(b))k[e[d]].length=0;else{var h=y(e[d],b);-1!==h&&k[e[d]].splice(h,1)}return a};a.destroy=function(){a.pause();p.style.backgroundPosition="";return a};l=(G("backgroundPosition")||G("backgroundPositionX")+" "+G("backgroundPositionY")).replace(/left|top/gi,0).split(" ");d={x:0|parseInt(l[0],
+10),y:0|parseInt(l[1],10)};if(B)a.pos=d;else{for(l=q.length=0;l<g.frames;l++)g.vertical?d.y=l*-x:d.x=l*-s,q.push(d.x+"px "+d.y+"px");a.frames=q.length;a.frame=0}}function j(p){return Object.prototype.toString.call(p).match(/\s([a-z]+)/i)[1].toLowerCase()}for(var u=n.cancelAnimationFrame||n.cancelRequestAnimationFrame,C=n.requestAnimationFrame,v=["moz","webkit","o"],y=0,m=0,J=v.length;m<J&&!u;++m)C=(u=n[v[m]+"CancelAnimationFrame"]||n[v[m]+"CancelRequestAnimationFrame"])&&n[v[m]+"RequestAnimationFrame"];
+u||(C=function(p){var j=+new Date,m=Math.max(0,16-(j-y));y=j+m;return n.setTimeout(function(){p(j+m)},m)},u=function(j){clearTimeout(j)});n.Motio=z;z.defaults={fps:15,frames:0,vertical:0,speedX:0,speedY:0,bgWidth:0,bgHeight:0}})(window);
diff --git a/motio.jquery.json b/motio.jquery.json
index 13c2595..1ad0d7e 100644
--- a/motio.jquery.json
+++ b/motio.jquery.json
@@ -2,7 +2,7 @@
 	"name": "motio",
 	"title": "Motio",
 	"description": "Sprite based animations and panning.",
-	"version": "2.0.0",
+	"version": "2.0.1",
 	"keywords": [
 		"sprite",
 		"panning",