diff --git a/mustache.js b/mustache.js
index 700f536..be3d01a 100644
--- a/mustache.js
+++ b/mustache.js
@@ -9,9 +9,9 @@
   if (typeof exports === "object" && exports) {
     factory(exports); // CommonJS
   } else if (typeof define === "function" && define.amd) {
-    define(factory({})); // AMD
+    define(['exports'], factory); // AMD
   } else {
-    global.Mustache = factory({}); // <script>
+    factory(global.Mustache = {}); // <script>
   }
 }(this, function (mustache) {
 
@@ -39,7 +39,7 @@
   function isWhitespace(string) {
     return !testRegExp(nonSpaceRe, string);
   }
-  
+
   var entityMap = {
     "&": "&amp;",
     "<": "&lt;",
@@ -575,6 +575,4 @@
   mustache.Context = Context;
   mustache.Writer = Writer;
 
-  return mustache;
-
 }));
diff --git a/package.json b/package.json
index 850e2ba..1542449 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "mocha": "1.5.0"
   },
   "volo": {
-    "url": "https://raw.github.com/janl/mustache.js/0.7.3/mustache.js"
+    "url": "https://raw.github.com/janl/mustache.js/{version}/mustache.js"
   },
   "scripts": {
     "test": "mocha test"