diff --git a/Source/Slick.Finder.js b/Source/Slick.Finder.js
index 43fb7dec..2574e562 100644
--- a/Source/Slick.Finder.js
+++ b/Source/Slick.Finder.js
@@ -7,7 +7,8 @@ requires: Slick.Parser
 ...
 */
 
-;(function(){
+;(function(define){
+define(["./Slick.Parser"], function(Slick){
 
 var local = {},
 	featuresCache = {},
@@ -888,7 +889,7 @@ local.attributeGetters = {
 
 // Slick
 
-var Slick = local.Slick = (this.Slick || {});
+local.Slick = Slick;
 
 Slick.version = '1.1.5';
 
@@ -965,6 +966,9 @@ Slick.uidOf = function(node){
 	return local.getUIDHTML(node);
 };
 
-if (!this.Slick) this.Slick = Slick;
+});
+})(typeof define != "undefined" ? define: function(factory){
+	// Slick NS
+	factory(this.Slick || (this.Slick = {}));
+});
 
-}).apply(/*<CommonJS>*/(typeof exports != 'undefined') ? exports : /*</CommonJS>*/this);
diff --git a/Source/Slick.Parser.js b/Source/Slick.Parser.js
index e9e78f7a..3c08f26d 100644
--- a/Source/Slick.Parser.js
+++ b/Source/Slick.Parser.js
@@ -6,7 +6,8 @@ provides: Slick.Parser
 ...
 */
 
-;(function(){
+;(function(define){
+define(["exports"], function(exports){
 
 var parsed,
 	separatorIndex,
@@ -215,16 +216,14 @@ function parser(
 	return '';
 };
 
-// Slick NS
-
-var Slick = (this.Slick || {});
-
-Slick.parse = function(expression){
+exports.parse = function(expression){
 	return parse(expression);
 };
 
-Slick.escapeRegExp = escapeRegExp;
-
-if (!this.Slick) this.Slick = Slick;
+exports.escapeRegExp = escapeRegExp;
 
-}).apply(/*<CommonJS>*/(typeof exports != 'undefined') ? exports : /*</CommonJS>*/this);
+});
+})(typeof define != "undefined" ? define: function(factory){
+	// Slick NS
+	factory(this.Slick || (this.Slick = {}));
+});