diff --git a/.directory b/.directory
new file mode 100644
index 0000000..9cba580
--- /dev/null
+++ b/.directory
@@ -0,0 +1,6 @@
+[Dolphin]
+Timestamp=2013,6,9,21,16,48
+Version=3
+
+[Settings]
+HiddenFilesShown=true
diff --git a/Gruntfile.js b/Gruntfile.js
index 6e03b8e..69c4240 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -39,8 +39,8 @@ module.exports = function(grunt) {
 			options: {
 				urls: (function() {
 							var res = [];
-							['2.0.1', '1.10.0', '1.9.1', '1.8.3' ].forEach( function(jqversion) {
-								['1.10.3', '1.9.2', '1.8.24'].forEach( function(uiversion) {
+							['2.1.0', '2.0.3', '1.10.2', '1.9.1', '1.8.3' ].forEach( function(jqversion) {
+								['1.10.4', '1.9.2', '1.8.24'].forEach( function(uiversion) {
 									this.push('http://localhost:<%= connect.server.options.port %>/test/imgNotes.html?jquery=' + jqversion + '&jquery-ui=' + uiversion);
 								}, this);
 							}, res);
diff --git a/README.md b/README.md
index ea722af..128005b 100644
--- a/README.md
+++ b/README.md
@@ -21,8 +21,9 @@ The plugin is known to work with the configuration described below:
  * [jQuery](http://jquery.com/) (>=1.8)
  * [jQuery UI](http://jqueryui.com/) (>=1.8)
     * [Widget Factory](http://api.jqueryui.com/jQuery.widget/)
- * [jQuery Mousewheel](http://brandonaaron.net/code/mousewheel/docs) (>=3.0)
- * [jQuery imgViewer](https://github.com/waynegm/imgViewer) (>=0.6.0)
+ * [toe.js](https://github.com/visiongeist/toe.js) (>=3.0)
+ * [Zoetrope](https://github.com/benplum/Zoetrope) (>=3.0)
+ * [jQuery imgViewer](https://github.com/waynegm/imgViewer) (>=0.7.0)
 
 ## Usage
 
@@ -34,7 +35,8 @@ Include either the development version or minified production version of the JS
 	...
 	<script src="jquery.js"></script>
 	<script src="jquery-ui.js"></script>
-	<script src="jquery.mousewheel.js"></script>
+	<script src="jquery.fs.zoetrope.min.js"></script>
+	<script src="toe.min.js"></script>
 	<script src="imgViewer.min.js"></script>
 	<script src="imgNotes.min.js"></script>
 	...
@@ -107,6 +109,15 @@ $("#image1").imgNotes("option", "zoomStep", 0.05);
 $("#image1").imgNotes("option", "zoom", 3);
 ```
 
+###zoomable
+  * Controls if image will be zoomable
+  * Default: true
+  * Example - to disble image zooming:
+
+```javascript
+$("#image1").imgNotes("option", "zoomable", false);
+```
+
 ###onAdd
   * Callback triggered when a marker/note is added to the widget to allow developers to define their own markers
    This will happen when notes are imported using the "import" method and when the user clicks on the widget in edit mode
@@ -193,3 +204,7 @@ Copyright (c) 2013 Wayne Mogg.
 ## Release History
 ### 0.6
 First release
+### 0.7
+Update to work with imgViewer 0.7
+Add zoomable option to disable zooming
+Updated Grunfile.js to include tests against latest version (2.1.0) of jQuery.
\ No newline at end of file
diff --git a/dist/imgNotes.js b/dist/imgNotes.js
index fedaa04..d8d59fd 100644
--- a/dist/imgNotes.js
+++ b/dist/imgNotes.js
@@ -1,11 +1,12 @@
-/*! jQuery imgNotes - v0.6.0 - 2013-06-09
+/*! jQuery imgNotes - v0.7.0 - 2014-06-19
 * https://github.com/waynegm/imgNotes
-* Copyright (c) 2013 Wayne Mogg; Licensed MIT */
+* Copyright (c) 2014 Wayne Mogg; Licensed MIT */
 ;(function($) {
 	$.widget("wgm.imgNotes", {
 		options: {
 			zoom: 1,
 			zoomStep: 0.1,
+			zoomable: true,
 			canEdit: false,
 			vAll: "middle",
 			hAll: "middle",
@@ -120,7 +121,10 @@
 								$.each(self.notes, function() {
 									self._updateMarkerPos(this);
 								});
-							}
+							},
+							zoom: self.options.zoom,
+							zoomStep: self.options.zoomStep,
+							zoomable: self.options.zoomable
 			});
 		},
 /*
@@ -162,6 +166,9 @@
 				case 'zoomStep':
 					$(this.img).imgViewer("option", "zoomStep", value);
 					break;
+				case 'zoomable':
+					$(this.img).imgViewer("option", "zoomable", value);
+					break;
 			}
 		},
 		
diff --git a/dist/imgNotes.min.js b/dist/imgNotes.min.js
index 0000efe..294a7b7 100644
--- a/dist/imgNotes.min.js
+++ b/dist/imgNotes.min.js
@@ -1,4 +1,4 @@
-/*! jQuery imgNotes - v0.6.0 - 2013-06-09
+/*! jQuery imgNotes - v0.7.0 - 2014-06-19
 * https://github.com/waynegm/imgNotes
-* Copyright (c) 2013 Wayne Mogg; Licensed MIT */
-(function(t){t.widget("wgm.imgNotes",{options:{zoom:1,zoomStep:.1,canEdit:!1,vAll:"middle",hAll:"middle",onAdd:function(){return this.options.vAll="bottom",this.options.hAll="middle",t(document.createElement("span")).addClass("marker black").html(this.noteCount)},onEdit:function(e,i){var o=t(i);return t("#NoteDialog").remove(),t('<div id="NoteDialog"></div>').dialog({title:"Note Editor",resizable:!1,modal:!0,height:"300",width:"450",position:{my:"left bottom",at:"right top",of:i},buttons:{Save:function(){var e=t("textarea",this).val();o.data("note",e),t(this).dialog("close")},Delete:function(){o.trigger("remove"),t(this).dialog("close")},Cancel:function(){t(this).dialog("close")}},open:function(){t(this).css("overflow","hidden");var e=t('<textarea id="txt" style="height:100%; width:100%;">');t(this).html(e),e.val(o.data("note"))}})},onShow:function(e,i){var o=t(i);return t("#NoteDialog").remove(),t('<div id="NoteDialog"></div>').dialog({modal:!1,resizable:!1,height:300,width:250,position:{my:"left bottom",at:"right top",of:i},buttons:{Close:function(){t(this).dialog("close")}},open:function(){t(this).html(o.data("note")),t(this).closest(".ui-dialog").find(".ui-dialog-titlebar:first").hide()},close:function(){t(this).dialog("remove")}})}},_create:function(){var e=this;this.element.is("img")||t.error("imgNotes plugin can only be applied to img elements"),e.notes=[],e.noteCount=0,e.img=e.element[0];var i=t(e.img);i.imgViewer({onClick:function(t,i){if(e.options.canEdit){t.preventDefault();var o=i.cursorToImg(t.pageX,t.pageY);if(o){var a=e.addNote(o.x,o.y);e._trigger("onEdit",t,a)}}},onUpdate:function(){t.each(e.notes,function(){e._updateMarkerPos(this)})}})},destroy:function(){this.clear(),t(this.img).imgViewer("destroy"),t.Widget.prototype.destroy.call(this)},_setOption:function(e,i){switch(e){case"vAll":switch(i){case"top":break;case"bottom":break;default:i="middle"}break;case"hAll":switch(i){case"left":break;case"right":break;default:i="middle"}}var o=t.ui.version.split(".");switch(o[0]>1||o[1]>8?this._super(e,i):t.Widget.prototype._setOption.apply(this,arguments),e){case"zoom":t(this.img).imgViewer("option","zoom",i);break;case"zoomStep":t(this.img).imgViewer("option","zoomStep",i)}},addNote:function(e,i,o){var a=this;this.noteCount++;var n=this.options.onAdd.call(this),s=t(n);switch(t(this.img).imgViewer("addElem",n),s.data("relx",e).data("rely",i).data("note",o),this.options.vAll){case"top":s.data("yOffset",0);break;case"bottom":s.data("yOffset",s.height());break;default:s.data("yOffset",Math.round(s.height()/2))}switch(this.options.hAll){case"left":s.data("xOffset",0);break;case"right":s.data("xOffset",s.width());break;default:s.data("xOffset",Math.round(s.width()/2))}return s.click(function(t){t.preventDefault(),a.options.canEdit?a._trigger("onEdit",t,n):a._trigger("onShow",t,n)}),s.on("remove",function(){a._delete(n)}),this._updateMarkerPos(n),this.notes.push(n),n},count:function(){return this.noteCount},_updateMarkerPos:function(e){var i=t(e),o=t(this.img),a=o.imgViewer("imgToView",i.data("relx"),i.data("rely"));a&&i.css({left:a.x-i.data("xOffset"),top:a.y-i.data("yOffset"),position:"absolute"})},_delete:function(e){this.notes=this.notes.filter(function(t){return t!==e}),t(e).remove()},clear:function(){var e=this;t.each(e.notes,function(){var e=t(this);e.remove()}),e.notes=[],e.noteCount=0},"import":function(e){var i=this;t.each(e,function(){i.addNote(this.x,this.y,this.note)})},"export":function(){var e=[];return t.each(this.notes,function(){var i=t(this);e.push({x:i.data("relx"),y:i.data("rely"),note:i.data("note")})}),e}})})(jQuery);
\ No newline at end of file
+* Copyright (c) 2014 Wayne Mogg; Licensed MIT */
+(function(t){t.widget("wgm.imgNotes",{options:{zoom:1,zoomStep:.1,zoomable:!0,canEdit:!1,vAll:"middle",hAll:"middle",onAdd:function(){return this.options.vAll="bottom",this.options.hAll="middle",t(document.createElement("span")).addClass("marker black").html(this.noteCount)},onEdit:function(e,o){var i=t(o);return t("#NoteDialog").remove(),t('<div id="NoteDialog"></div>').dialog({title:"Note Editor",resizable:!1,modal:!0,height:"300",width:"450",position:{my:"left bottom",at:"right top",of:o},buttons:{Save:function(){var e=t("textarea",this).val();i.data("note",e),t(this).dialog("close")},Delete:function(){i.trigger("remove"),t(this).dialog("close")},Cancel:function(){t(this).dialog("close")}},open:function(){t(this).css("overflow","hidden");var e=t('<textarea id="txt" style="height:100%; width:100%;">');t(this).html(e),e.val(i.data("note"))}})},onShow:function(e,o){var i=t(o);return t("#NoteDialog").remove(),t('<div id="NoteDialog"></div>').dialog({modal:!1,resizable:!1,height:300,width:250,position:{my:"left bottom",at:"right top",of:o},buttons:{Close:function(){t(this).dialog("close")}},open:function(){t(this).html(i.data("note")),t(this).closest(".ui-dialog").find(".ui-dialog-titlebar:first").hide()},close:function(){t(this).dialog("remove")}})}},_create:function(){var e=this;this.element.is("img")||t.error("imgNotes plugin can only be applied to img elements"),e.notes=[],e.noteCount=0,e.img=e.element[0];var o=t(e.img);o.imgViewer({onClick:function(t,o){if(e.options.canEdit){t.preventDefault();var i=o.cursorToImg(t.pageX,t.pageY);if(i){var a=e.addNote(i.x,i.y);e._trigger("onEdit",t,a)}}},onUpdate:function(){t.each(e.notes,function(){e._updateMarkerPos(this)})},zoom:e.options.zoom,zoomStep:e.options.zoomStep,zoomable:e.options.zoomable})},destroy:function(){this.clear(),t(this.img).imgViewer("destroy"),t.Widget.prototype.destroy.call(this)},_setOption:function(e,o){switch(e){case"vAll":switch(o){case"top":break;case"bottom":break;default:o="middle"}break;case"hAll":switch(o){case"left":break;case"right":break;default:o="middle"}}var i=t.ui.version.split(".");switch(i[0]>1||i[1]>8?this._super(e,o):t.Widget.prototype._setOption.apply(this,arguments),e){case"zoom":t(this.img).imgViewer("option","zoom",o);break;case"zoomStep":t(this.img).imgViewer("option","zoomStep",o);break;case"zoomable":t(this.img).imgViewer("option","zoomable",o)}},addNote:function(e,o,i){var a=this;this.noteCount++;var n=this.options.onAdd.call(this),s=t(n);switch(t(this.img).imgViewer("addElem",n),s.data("relx",e).data("rely",o).data("note",i),this.options.vAll){case"top":s.data("yOffset",0);break;case"bottom":s.data("yOffset",s.height());break;default:s.data("yOffset",Math.round(s.height()/2))}switch(this.options.hAll){case"left":s.data("xOffset",0);break;case"right":s.data("xOffset",s.width());break;default:s.data("xOffset",Math.round(s.width()/2))}return s.click(function(t){t.preventDefault(),a.options.canEdit?a._trigger("onEdit",t,n):a._trigger("onShow",t,n)}),s.on("remove",function(){a._delete(n)}),this._updateMarkerPos(n),this.notes.push(n),n},count:function(){return this.noteCount},_updateMarkerPos:function(e){var o=t(e),i=t(this.img),a=i.imgViewer("imgToView",o.data("relx"),o.data("rely"));a&&o.css({left:a.x-o.data("xOffset"),top:a.y-o.data("yOffset"),position:"absolute"})},_delete:function(e){this.notes=this.notes.filter(function(t){return t!==e}),t(e).remove()},clear:function(){var e=this;t.each(e.notes,function(){var e=t(this);e.remove()}),e.notes=[],e.noteCount=0},"import":function(e){var o=this;t.each(e,function(){o.addNote(this.x,this.y,this.note)})},"export":function(){var e=[];return t.each(this.notes,function(){var o=t(this);e.push({x:o.data("relx"),y:o.data("rely"),note:o.data("note")})}),e}})})(jQuery);
\ No newline at end of file
diff --git a/examples/basic_interactive.html b/examples/basic_interactive.html
index 15ed575..60b71b0 100644
--- a/examples/basic_interactive.html
+++ b/examples/basic_interactive.html
@@ -7,7 +7,8 @@
 		<link rel="stylesheet" href="http://code.jquery.com/ui/1.10.2/themes/smoothness/jquery-ui.css" media="screen">
 		<script type="text/javascript" src="../libs/jquery/jquery.js"></script>
 		<script type="text/javascript" src="../libs/jquery/jquery-ui.js"></script>
-		<script type="text/javascript" src="../libs/jquery.mousewheel.min.js"></script>
+		<script type="text/javascript" src="../libs/jquery.fs.zoetrope.min.js"></script>
+		<script type="text/javascript" src="../libs/toe.min.js"></script>
 		<script type="text/javascript" src="../libs/imgViewer.js"></script>
 		<script type="text/javascript" src="../src/imgNotes.js"></script>
 		
diff --git a/examples/custom_editor.html b/examples/custom_editor.html
index e036fa8..918a98f 100644
--- a/examples/custom_editor.html
+++ b/examples/custom_editor.html
@@ -8,7 +8,8 @@
 
 		<script type="text/javascript" src="../libs/jquery/jquery.js"></script>
 		<script type="text/javascript" src="../libs/jquery/jquery-ui.js"></script>
-		<script type="text/javascript" src="../libs/jquery.mousewheel.min.js"></script>
+		<script type="text/javascript" src="../libs/jquery.fs.zoetrope.min.js"></script>
+		<script type="text/javascript" src="../libs/toe.min.js"></script>
 		<script type="text/javascript" src="custom_editor_files/jquery.sceditor.min.js"></script>
 		<script type="text/javascript" src="../libs/imgViewer.js"></script>
 		<script type="text/javascript" src="../src/imgNotes.js"></script>
diff --git a/examples/custom_editor_files/.directory b/examples/custom_editor_files/.directory
new file mode 100644
index 0000000..5503415
--- /dev/null
+++ b/examples/custom_editor_files/.directory
@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2013,6,24,21,28,9
+Version=3
+ViewMode=1
diff --git a/examples/custom_marker.html b/examples/custom_marker.html
index 833bb2c..113c273 100644
--- a/examples/custom_marker.html
+++ b/examples/custom_marker.html
@@ -7,7 +7,8 @@
 		<link rel="stylesheet" href="http://code.jquery.com/ui/1.10.2/themes/smoothness/jquery-ui.css" media="screen">
 		<script type="text/javascript" src="../libs/jquery/jquery.js"></script>
 		<script type="text/javascript" src="../libs/jquery/jquery-ui.js"></script>
-		<script type="text/javascript" src="../libs/jquery.mousewheel.min.js"></script>
+		<script type="text/javascript" src="../libs/jquery.fs.zoetrope.min.js"></script>
+		<script type="text/javascript" src="../libs/toe.min.js"></script>
 		<script type="text/javascript" src="../libs/imgViewer.js"></script>
 		<script type="text/javascript" src="../src/imgNotes.js"></script>
 		
diff --git a/examples/custom_view.html b/examples/custom_view.html
index 66857f1..f42130a 100644
--- a/examples/custom_view.html
+++ b/examples/custom_view.html
@@ -7,7 +7,8 @@
 
 		<script type="text/javascript" src="../libs/jquery/jquery.js"></script>
 		<script type="text/javascript" src="../libs/jquery/jquery-ui.js"></script>
-		<script type="text/javascript" src="../libs/jquery.mousewheel.min.js"></script>
+		<script type="text/javascript" src="../libs/jquery.fs.zoetrope.min.js"></script>
+		<script type="text/javascript" src="../libs/toe.min.js"></script>
 		<script type="text/javascript" src="../libs/imgViewer.js"></script>
 		<script type="text/javascript" src="../src/imgNotes.js"></script>
 		
diff --git a/imgNotes.jquery.json b/imgNotes.jquery.json
index e78fb15..205123c 100644
--- a/imgNotes.jquery.json
+++ b/imgNotes.jquery.json
@@ -2,7 +2,7 @@
   "name": "imgNotes",
   "title": "jQuery imgNotes",
   "description": "Extension of the jQuery imgViewer plugin to add markers and notes to the image.",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "homepage": "",
   "author": {
     "name": "Wayne Mogg"
@@ -22,7 +22,8 @@
   "dependencies": {
     "jquery": ">=1.8",
     "jquery-ui": ">=1.8",
-    "jQuery Mousewheel":  ">=3.0",
+    "toe.js":  ">=3.0",
+    "zoetrope": ">=3.0",
     "jQuery imgViewer": ">=0.6"
   },
   "keywords": [
diff --git a/libs/imgViewer.js b/libs/imgViewer.js
index b4a21fb..a643a78 100644
--- a/libs/imgViewer.js
+++ b/libs/imgViewer.js
@@ -1,11 +1,73 @@
-/*! jQuery imgViewer - v0.6.0 - 2013-06-06
-* https://github.com/waynegm/imgViewer
-* Copyright (c) 2013 Wayne Mogg; Licensed MIT */
+/*
+ * imgViewer
+ * 
+ *
+ * Copyright (c) 2013 Wayne Mogg
+ * Licensed under the MIT license.
+ */
+
+/*
+ *	Add a tap and drag gesture to toe.js
+ */
+;(function ($, touch, window, undefined) {
+	
+	var namespace = 'drag', 
+		cfg = {
+			distance: 40 // minimum
+		},
+		started;
+ 
+	touch.track(namespace, {
+		touchstart: function (event, state, start) {
+			started = false;
+			state[namespace] = {
+				finger: start.point.length,
+				start: start,
+				deltaX: 0,
+				deltaY: 0
+			};
+		},
+		touchmove: function (event, state, move) {
+			var opt = $.extend(cfg, event.data);
+		 
+			// if another finger was used then increment the amount of fingers used
+			state[namespace].finger = move.point.length > state[namespace].finger ? move.point.length : state[namespace].finger;
+		 
+			var distance = touch.calc.getDistance(state.start.point[0], move.point[0]);
+			if (Math.abs(1 - distance) > opt.distance) {
+				if (!started) {
+					$(event.target).trigger($.Event('dragstart', state[namespace]));
+					started = true;
+				}
+				state[namespace].deltaX = (move.point[0].x - state.start.point[0].x);
+				state[namespace].deltaY = (move.point[0].y - state.start.point[0].y);
+				$(event.target).trigger($.Event('drag', state[namespace]));
+			}
+		},
+		touchend: function (event, state, end) {
+			if (started) {
+				started = false;
+			 
+				var distance = touch.calc.getDistance(state.start.point[0], end.point[0]);
+				if (distance > cfg.distance) {
+					state[namespace].deltaX = (end.point[0].x - state.start.point[0].x);
+					state[namespace].deltaY = (end.point[0].y - state.start.point[0].y);
+					$(event.target).trigger($.Event('dragend', state[namespace]));
+				}
+			}
+		}
+	});
+}(jQuery, jQuery.toe, this));
+
+/*
+ *	imgViewer plugin starts here
+ */ 
 ;(function($) {
 	$.widget("wgm.imgViewer", {
 		options: {
 			zoomStep: 0.1,
 			zoom: 1,
+			zoomable: true,
 			onClick: null,
 			onUpdate: null
 		},
@@ -76,7 +138,8 @@
 								top: 0+"px",
 								left: 0+"px",
 								width: width+"px",
-								height: height+"px"
+								height: height+"px",
+								"-webkit-tap-highlight-color": "transparent"
 					});
 //			the initial view is centered at the orignal image
 					self.vCenter = {
@@ -88,45 +151,134 @@
 				if (this.complete) { $(this).load(); }
 			});
 /*
- *		Mousewheel event handler for image zooming
- */					
-			$zimg.mousewheel(function(event, delta) {
-				event.preventDefault();
-				self.options.zoom -= delta * self.options.zoomStep;
-				self.update();
-			});
+ *			Render loop code during dragging and scaling using requestAnimationFrame
+ */
+			self.render = false;
+			function startRenderLoop() {
+				if (!self.render) {
+					self.render = true;
+					doRender();
+				}
+			}
+			
+			function stopRenderLoop() {
+				self.render = false;
+			}
+			
+			function doRender() {
+				if (self.render) {
+					window.requestAnimationFrame(doRender);
+					self.update();
+				}
+			}	
 /*
- *		Mouse drag handler for image panning
+ *		Touch event handlers
  */
-			$zimg.mousedown( function(e) {
-				e.preventDefault();
-				var last = e;
-				$zimg.mousemove( function(e) {
-					e.preventDefault();
+			$zimg.on('touchstart touchmove touchend', function(ev) {
+				ev.preventDefault();
+			});
+			
+			$zimg.on( "tap" , function(ev) {
+				if (!self.dragging) {
+					ev.preventDefault();
+					self._trigger("onClick", ev, self);
+				}
+			});
+			$zimg.on( "transformstart" , function(ev) {
+				if (self.options.zoomable) {
+					ev.preventDefault();
+					self.pinchzoom = self.options.zoom;
+					startRenderLoop();
+				}
+			});
+			$zimg.on("transform", function(ev) {
+				if (self.options.zoomable) {
+					ev.preventDefault();
+					self.options.zoom = self.pinchzoom * ev.scale;
+				}
+			});
+			$zimg.on("transformend", function(ev) {
+				if (self.options.zoomable) {
+					ev.preventDefault();
+					self.options.zoom = self.pinchzoom * ev.scale;
+					stopRenderLoop();
+				}
+			});
+			
+			$zimg.on( "dragstart" , function(ev) {
+				if (self.options.zoomable) {
+					ev.preventDefault();
 					self.dragging = true;
-					self.vCenter.x = self.vCenter.x - (e.pageX - last.pageX)/self.options.zoom;
-					self.vCenter.y = self.vCenter.y - (e.pageY - last.pageY)/self.options.zoom;
-					last = e;
-					self.update();
-				});
-				function endDrag(e) {
-					e.preventDefault();
-					setTimeout(function() {	self.dragging = false; }, 0);
-					$zimg.unbind("mousemove");
-					$zimg.unbind("mouseup");
-					$(document).unbind("mouseup");
+					self.dragXorg = self.vCenter.x;
+					self.dragYorg = self.vCenter.y;
+					startRenderLoop();
+				}
+			});
+			$zimg.on( "drag", function(ev) {
+				if (self.options.zoomable) {
+					ev.preventDefault();
+					self.vCenter.x = self.dragXorg - ev.deltaX/self.options.zoom;
+					self.vCenter.y = self.dragYorg - ev.deltaY/self.options.zoom;
+				}
+			});
+			
+			$zimg.on( "dragend", function(ev) {
+				if (self.options.zoomable) {
+					ev.preventDefault();
+					self.dragging = false;
+					self.vCenter.x = self.dragXorg - ev.deltaX/self.options.zoom;
+					self.vCenter.y = self.dragYorg - ev.deltaY/self.options.zoom;
+					stopRenderLoop();
 				}
-				$(document).one("mouseup", endDrag);
-				$zimg.one("mouseup", endDrag);
 			});
+
 /*
- *		Mouse click handler - supply an action by defining the onClick option
+ *		Mouse event handlers
  */
+			function MouseWheelHandler(ev) {
+				if (self.options.zoomable) {
+					ev.preventDefault();
+					var e = ev.originalEvent;	
+					var delta = Math.max(-1, Math.min(1, (e.wheelDelta || -e.detail)));
+					self.options.zoom -= delta * self.options.zoomStep;
+					self.update();
+				}
+			}
+			$zimg.on("mousewheel", MouseWheelHandler);
+			$zimg.on("DOMMouseScroll", MouseWheelHandler);
+			$zimg.on("onmousewheel", MouseWheelHandler);
+			
 			$zimg.click(function(e) {
 				if (!self.dragging) {
 					self._trigger("onClick", e, self);
 				}
 			});
+			
+			$zimg.mousedown( function(e) {
+				if (self.options.zoomable) {
+					e.preventDefault();
+					startRenderLoop();
+					var last = e;
+					$zimg.mousemove( function(e) {
+						e.preventDefault();
+						self.dragging = true;
+						self.vCenter.x = self.vCenter.x - (e.pageX - last.pageX)/self.options.zoom;
+						self.vCenter.y = self.vCenter.y - (e.pageY - last.pageY)/self.options.zoom;
+						last = e;
+					});
+					function endDrag(e) {
+						e.preventDefault();
+						stopRenderLoop();
+						setTimeout(function() {	self.dragging = false; }, 0);
+						$zimg.unbind("mousemove");
+						$zimg.unbind("mouseup");
+						$(document).unbind("mouseup");
+					}
+					$(document).one("mouseup", endDrag);
+					$zimg.one("mouseup", endDrag);
+				}
+			});
+			
 /*
  *		Window resize handler
  */
@@ -148,7 +300,6 @@
 		destroy: function() {
 			var $zimg = $(this.zimg);
 			$zimg.unbind("click");
-			$zimg.unmousewheel();
 			$(window).unbind("resize");
 			$zimg.remove();
 			$(this.view).remove();
@@ -331,6 +482,7 @@
 									y: half_height
 					};
 					this.options.zoom = 1;
+					zoom = 1;
 				} else {
 					zTop = Math.round(half_height - this.vCenter.y * zoom);
 					zLeft = Math.round(half_width - this.vCenter.x * zoom);
@@ -363,11 +515,13 @@
 								height: height+"px"
 				});
 				$(this.zimg).css({
-								left: zLeft+"px",
-								top: zTop+"px",
-								width: zWidth+"px",
-								height: zHeight+"px"
+								width: width+"px",
+								height: height+"px"
 				});
+
+				var xt = -(this.vCenter.x - half_width)*zoom;
+				var yt = -(this.vCenter.y - half_height)*zoom;
+				$(this.zimg).css({transform: "translate(" + xt + "px," + yt + "px) scale(" + zoom + "," + zoom + ")" });
 /*
  *		define the onUpdate option to do something after the image is redisplayed
  *		probably shouldn't pass out the this object - need to think of something better
diff --git a/libs/jquery.fs.zoetrope.min.js b/libs/jquery.fs.zoetrope.min.js
new file mode 100644
index 0000000..dee1d48
--- /dev/null
+++ b/libs/jquery.fs.zoetrope.min.js
@@ -0,0 +1,9 @@
+/* 
+ * Zoetrope v3.0.4 - 2014-03-14 
+ * A requestAnimationFrame polyfill and jQuery Animation shim. Part of the Formstone Library. 
+ * http://formstone.it/zoetrope/ 
+ * 
+ * Copyright 2014 Ben Plum; MIT Licensed 
+ */ 
+
+!function(a){"use strict";for(var b=0,c=["webkit","moz"],d=0;d<c.length&&!a.requestAnimationFrame;d++)a.requestAnimationFrame=a[c[d]+"RequestAnimationFrame"],a.cancelAnimationFrame=a[c[d]+"CancelAnimationFrame"]||a[c[d]+"CancelRequestAnimationFrame"];a.nativeRAF="undefined"!=typeof a.requestAnimationFrame,a.nativeRAF||(a.requestAnimationFrame=function(c){var d=(new Date).getTime(),e=Math.max(0,16-(d-b)),f=a.setTimeout(function(){c(d+e)},e);return b=d+e,f},a.cancelAnimationFrame=function(a){clearTimeout(a)})}(this),function(a,b){"use strict";function c(){d&&(b.requestAnimationFrame(c),jQuery.fx.tick())}var d=!1;b.nativeRAF||(a.fx.timer=function(b){b()&&a.timers.push(b)&&!d&&(d=!0,c())},a.fx.stop=function(){d=!1})}(jQuery,this);
\ No newline at end of file
diff --git a/libs/jquery.mousewheel.min.js b/libs/jquery.mousewheel.min.js
deleted file mode 100644
index 3390202..0000000
--- a/libs/jquery.mousewheel.min.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*! Copyright (c) 2011 Brandon Aaron (http://brandonaaron.net)
- * Licensed under the MIT License (LICENSE.txt).
- *
- * Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.
- * Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
- * Thanks to: Seamus Leahy for adding deltaX and deltaY
- *
- * Version: 3.0.6
- * 
- * Requires: 1.2.2+
- */
-(function(a){function d(b){var c=b||window.event,d=[].slice.call(arguments,1),e=0,f=!0,g=0,h=0;return b=a.event.fix(c),b.type="mousewheel",c.wheelDelta&&(e=c.wheelDelta/120),c.detail&&(e=-c.detail/3),h=e,c.axis!==undefined&&c.axis===c.HORIZONTAL_AXIS&&(h=0,g=-1*e),c.wheelDeltaY!==undefined&&(h=c.wheelDeltaY/120),c.wheelDeltaX!==undefined&&(g=-1*c.wheelDeltaX/120),d.unshift(b,e,g,h),(a.event.dispatch||a.event.handle).apply(this,d)}var b=["DOMMouseScroll","mousewheel"];if(a.event.fixHooks)for(var c=b.length;c;)a.event.fixHooks[b[--c]]=a.event.mouseHooks;a.event.special.mousewheel={setup:function(){if(this.addEventListener)for(var a=b.length;a;)this.addEventListener(b[--a],d,!1);else this.onmousewheel=d},teardown:function(){if(this.removeEventListener)for(var a=b.length;a;)this.removeEventListener(b[--a],d,!1);else this.onmousewheel=null}},a.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})})(jQuery)
diff --git a/libs/toe.min.js b/libs/toe.min.js
new file mode 100644
index 0000000..f12e37f
--- /dev/null
+++ b/libs/toe.min.js
@@ -0,0 +1,7 @@
+/*!
+ * toe.js
+ * version 3.0.5
+ * author: Damien Antipa
+ * https://github.com/dantipa/toe.js
+ */
+!function(a,b){function c(b,c,d,e){a.each(h,function(a,f){f[b].call(this,c,d,e)})}function d(a){var b=i.Event(a);g=i.State(b),c("touchstart",a,g,b)}function e(a){if(g){var b=i.Event(a);g.move.push(b),c("touchmove",a,g,b)}}function f(a){var b=i.Event(a);g.end=b,c("touchend",a,g,b)}var g,h={},i={active:!1,on:function(){a(document).on("touchstart MSPointerDown pointerdown",d).on("touchmove MSPointerMove MSPointerHover pointermove",e).on("touchend touchcancel MSPointerUp MSPointerCancel pointerup pointercancel",f),i.active=!0},off:function(){a(document).off("touchstart MSPointerDown pointerdown",d).off("touchmove MSPointerMove MSPointerHover pointermove ",e).off("touchend touchcancel MSPointerUp MSPointerCancel pointerup pointercancel",f),i.active=!1},track:function(a,b){h[a]=b},addEventParam:function(b,c){var d=a(b.target),e=d.offset(),f={pageX:b.point[0].x,pageY:b.point[0].y,offsetX:e.left-b.point[0].x,offsetY:e.top-b.point[0].y};return a.extend(f,c)},Event:function(b){var c={type:b.type,timestamp:(new Date).getTime(),target:b.target,point:[]},d=[];return b.type.indexOf("touch")>-1?d=b.changedTouches||b.originalEvent.changedTouches||b.touches||b.originalEvent.touches:b.type.match(/.*?pointer.*?/i)&&(d=[b.originalEvent]),a.each(d,function(a,b){c.point.push({x:b.pageX,y:b.pageY})}),c},State:function(a){a.point[0];return{start:a,move:[],end:null}},calc:{getDuration:function(a,b){return b.timestamp-a.timestamp},getDistance:function(a,b){return Math.sqrt(Math.pow(b.x-a.x,2)+Math.pow(b.y-a.y,2))},getAngle:function(a,b){return 180*Math.atan2(b.y-a.y,b.x-a.x)/Math.PI},getDirection:function(a){return-45>a&&a>-135?"up":a>=-45&&45>=a?"right":a>=45&&135>a?"down":a>=135||-135>=a?"left":"unknown"},getScale:function(a,b){var c=a.point,d=b.point;return 2===c.length&&2===d.length?(Math.sqrt(Math.pow(d[0].x-d[1].x,2)+Math.pow(d[0].y-d[1].y,2))/Math.sqrt(Math.pow(c[0].x-c[1].x,2)+Math.pow(c[0].y-c[1].y,2))).toFixed(2):0},getRotation:function(a,b){var c=a.point,d=b.point;return 2===c.length&&2===d.length?(180*Math.atan2(d[0].y-d[1].y,d[0].x-d[1].x)/Math.PI-180*Math.atan2(c[0].y-c[1].y,c[0].x-c[1].x)/Math.PI).toFixed(2):0}}};i.on(),a.toe=i}(jQuery,this),function(a,b){var c="swipe",d={distance:40,duration:1200,direction:"all"};b.track(c,{touchstart:function(a,b,d){b[c]={finger:d.point.length}},touchmove:function(a,b,d){b[c].finger=d.point.length>b[c].finger?d.point.length:b[c].finger},touchend:function(e,f,g){var h,i,j=a.extend(d,e.data);h=b.calc.getDuration(f.start,g),i=b.calc.getDistance(f.start.point[0],g.point[0]),h<j.duration&&i>j.distance&&(f[c].angle=b.calc.getAngle(f.start.point[0],g.point[0]),f[c].direction=b.calc.getDirection(f[c].angle),("all"===j.direction||f[c].direction===j.direction)&&a(e.target).trigger(a.Event(c,b.addEventParam(f.start,f[c]))))}})}(jQuery,jQuery.toe,this),function(a,b){var c=document.documentElement.clientWidth,d=document.documentElement.clientHeight,e=Math.sqrt(c*d),f=.02*e,g="tap",h={distance:f,duration:300,finger:1};b.track(g,{touchstart:function(a,b,c){b[g]={finger:c.point.length}},touchmove:function(a,b,c){b[g].finger=c.point.length>b[g].finger?c.point.length:b[g].finger},touchend:function(c,d,e){var f,i,j=a.extend(h,c.data);f=b.calc.getDuration(d.start,e),i=b.calc.getDistance(d.start.point[0],e.point[0]),f<j.duration&&i<j.distance&&d[g].finger===j.finger&&a(c.target).trigger(a.Event(g,b.addEventParam(d.start,d[g])))}})}(jQuery,jQuery.toe,this),function(a,b){var c,d,e="taphold",f={distance:20,duration:500,finger:1};b.track(e,{touchstart:function(g,h,i){var j=a.extend(f,g.data);d=!1,h[e]={finger:i.point.length},clearTimeout(c),c=setTimeout(function(){!d&&b.active&&h[e].finger===j.finger&&a(g.target).trigger(a.Event(e,b.addEventParam(i,h[e])))},j.duration)},touchmove:function(c,g,h){var i,j=a.extend(f,c.data);g[e].finger=h.point.length>g[e].finger?h.point.length:g[e].finger,i=b.calc.getDistance(g.start.point[0],h.point[0]),i>j.distance&&(d=!0)},touchend:function(){d=!0,clearTimeout(c)}})}(jQuery,jQuery.toe,this),function(a,b){var c,d="transform",e={scale:.1,rotation:15};b.track(d,{touchstart:function(a,b,e){c=!1,b[d]={start:e,move:[]}},touchmove:function(f,g,h){var i=a.extend(e,f.data);2===h.point.length&&(g[d].move.push(h),2!==g[d].start.point.length&&2===h.point.length&&(g[d].start=a.extend({},h)),g[d].rotation=b.calc.getRotation(g[d].start,h),g[d].scale=b.calc.getScale(g[d].start,h),(Math.abs(1-g[d].scale)>i.scale||Math.abs(g[d].rotation)>i.rotation)&&(c||(a(f.target).trigger(a.Event("transformstart",g[d])),c=!0),a(f.target).trigger(a.Event("transform",g[d]))))},touchend:function(e,f,g){c&&(c=!1,2!==g.point.length&&(f.end=a.extend({},f[d].move[f[d].move.length-1])),f[d].rotation=b.calc.getRotation(f[d].start,f.end),f[d].scale=b.calc.getScale(f[d].start,f.end),a(e.target).trigger(a.Event("transformend",f[d])))}})}(jQuery,jQuery.toe,this);
\ No newline at end of file
diff --git a/package.json b/package.json
index 097699d..582a276 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jquery-imgNotes-plugin",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "engines": {
     "node": ">= 0.8.0"
   },
diff --git a/src/imgNotes.js b/src/imgNotes.js
index 91e25d9..1bf87a6 100644
--- a/src/imgNotes.js
+++ b/src/imgNotes.js
@@ -10,6 +10,7 @@
 		options: {
 			zoom: 1,
 			zoomStep: 0.1,
+			zoomable: true,
 			canEdit: false,
 			vAll: "middle",
 			hAll: "middle",
@@ -124,7 +125,10 @@
 								$.each(self.notes, function() {
 									self._updateMarkerPos(this);
 								});
-							}
+							},
+							zoom: self.options.zoom,
+							zoomStep: self.options.zoomStep,
+							zoomable: self.options.zoomable
 			});
 		},
 /*
@@ -166,6 +170,9 @@
 				case 'zoomStep':
 					$(this.img).imgViewer("option", "zoomStep", value);
 					break;
+				case 'zoomable':
+					$(this.img).imgViewer("option", "zoomable", value);
+					break;
 			}
 		},
 		
diff --git a/test/imgNotes.html b/test/imgNotes.html
index 9cc9e4b..d20f122 100644
--- a/test/imgNotes.html
+++ b/test/imgNotes.html
@@ -6,7 +6,8 @@
   <!-- Load local jQuery. This can be overridden with a ?jquery=___ param. -->
   <script src="../libs/jquery-loader.js"></script>
   <script src="../libs/jquery-ui-loader.js"></script>
-  <script src="../libs/jquery.mousewheel.min.js"></script>
+	<script type="text/javascript" src="../libs/jquery.fs.zoetrope.min.js"></script>
+	<script type="text/javascript" src="../libs/toe.min.js"></script>
   <script src="../libs/imgViewer.js"></script>
   <!-- Load local QUnit. -->
   <link rel="stylesheet" href="../libs/qunit/qunit.css" media="screen">