0
@@ -14,7 +14,7 @@ var Concept = {
0
   },
0
 
0
   addMethods: function(source) {
0
-    if (source instanceof Mixin)
0
+    if (Object.isFunction(window.Mixin) && source instanceof Mixin)
0
       return this.mixin(source);
0
     for (var property in source)
0
       this.addMethod(property, source[property]);
0
@@ -56,11 +56,10 @@ var Class = {
0
   }
0
 };
0
 
0
-var Mixin = function(){};
0
-Mixin = Class.create(Concept, (function() {  
0
+var Mixin = Class.create(Concept, (function() {  
0
   return {
0
-    initialize: function(body) {
0
-      this.prototype = body || { };
0
+    initialize: function(source) {
0
+      this.prototype = source || { };
0
       this.implementors = [ ];
0
     },
0
 

0
@@ -8,6 +8,12 @@ var ClassExtensions = {
0
     return this;
0
   },
0
   
0
+  wrapMethods: function(wrappers) {
0
+    Object.keys(wrappers).each(function(property) {
0
+      this.wrapMethod(property, wrappers[property]);
0
+    }, this);
0
+  },
0
+  
0
   addOwnMethod: function(name, block) {
0
     this[name] = block;
0
     return this;
0
@@ -31,6 +37,7 @@ var ClassExtensions = {
0
   },
0
   
0
   ancestors: function() {
0
+    if (!this.superclass) return [ ];
0
     return [ this.superclass ].concat(this.superclass.ancestors());
0
   }
0
 };