diff --git a/make b/make
index ea2404ed..a01a23e4 100755
--- a/make
+++ b/make
@@ -5,9 +5,9 @@ import os
 
 def cat():
     print("** Combining js files")
-    cmd = 'ls src/**/*.js | grep -v couchdb | xargs cat  > dist/recline.js'
+    cmd = 'ls src/*.js | grep -v couchdb | xargs cat  > dist/recline.js'
     os.system(cmd)
-    cmd = 'ls src/*.js | grep -v couchdb | xargs cat  >> dist/recline.js'
+    cmd = 'ls src/**/*.js | grep -v couchdb | xargs cat  >> dist/recline.js'
     os.system(cmd)
 
     cmd = 'cat src/model.js src/backend.memory.js > dist/recline.dataset.js'
diff --git a/vendor/common-intl-wmustache.js b/vendor/common-intl-wmustache.js
index 3c661a39..49faaac6 100644
--- a/vendor/common-intl-wmustache.js
+++ b/vendor/common-intl-wmustache.js
@@ -3,6 +3,7 @@
  *
  * This code is licensed under GPL v3 http://choosealicense.com/licenses/gpl-3.0/
  */
+ (function (global) {
 "use strict";
 var I18nMessages = function(libraryID, translations, languageResolverOrLocale, appHardcodedLocale) {
     if (typeof this === 'undefined') {
@@ -117,4 +118,9 @@ var I18nMessages = function(libraryID, translations, languageResolverOrLocale, a
 I18nMessages.languageResolver = function() {
     var h = $('html');
     return h.attr('lang') || h.attr('xml:lang');
-};
\ No newline at end of file
+};
+
+
+global.I18nMessages = I18nMessages;
+
+}(window));
\ No newline at end of file