diff --git a/bin/pixi.dev.js b/bin/pixi.dev.js
index ad04473..542a82c 100644
--- a/bin/pixi.dev.js
+++ b/bin/pixi.dev.js
@@ -3369,6 +3369,11 @@
 	this.frame = frame;
 	this.width = frame.width;
 	this.height = frame.height;
+	
+	if(frame.x + frame.width > this.baseTexture.width || frame.y + frame.height > this.baseTexture.height)
+	{
+		throw new Error("Texture Error: frame does not fit inside the base Texture dimensions " + this);
+	}
 	//this.updateFrame = true;
 }
 
@@ -3396,7 +3401,6 @@
 				image.crossOrigin = '';
 			}
 			image.src = imageUrl;
-			
 			baseTexture = new PIXI.BaseTexture(image);
 			PIXI.BaseTextureCache[imageUrl] = baseTexture;
 		}
@@ -3669,7 +3673,7 @@
 		{
 			
 			var texture = PIXI.Texture.fromImage(filename, this.crossorigin);
-			if(!texture.hasLoaded)
+			if(!texture.baseTexture.hasLoaded)
 			{
 				
 				var scope = this;
@@ -3685,6 +3689,12 @@
 				
 				// already loaded!
 				this.loadCount--;
+				// if this hits zero here.. then everything was cached!
+				if(this.loadCount == 0)
+				{
+					this.dispatchEvent( { type: 'onComplete', content: this } );
+					if(this.onComplete)this.onComplete();
+				}
 			}
 			
 		}

diff --git a/bin/pixi.dev.js b/bin/pixi.dev.js
index ad04473..542a82c 100644
--- a/bin/pixi.dev.js
+++ b/bin/pixi.dev.js
@@ -3369,6 +3369,11 @@
 	this.frame = frame;
 	this.width = frame.width;
 	this.height = frame.height;
+	
+	if(frame.x + frame.width > this.baseTexture.width || frame.y + frame.height > this.baseTexture.height)
+	{
+		throw new Error("Texture Error: frame does not fit inside the base Texture dimensions " + this);
+	}
 	//this.updateFrame = true;
 }
 
@@ -3396,7 +3401,6 @@
 				image.crossOrigin = '';
 			}
 			image.src = imageUrl;
-			
 			baseTexture = new PIXI.BaseTexture(image);
 			PIXI.BaseTextureCache[imageUrl] = baseTexture;
 		}
@@ -3669,7 +3673,7 @@
 		{
 			
 			var texture = PIXI.Texture.fromImage(filename, this.crossorigin);
-			if(!texture.hasLoaded)
+			if(!texture.baseTexture.hasLoaded)
 			{
 				
 				var scope = this;
@@ -3685,6 +3689,12 @@
 				
 				// already loaded!
 				this.loadCount--;
+				// if this hits zero here.. then everything was cached!
+				if(this.loadCount == 0)
+				{
+					this.dispatchEvent( { type: 'onComplete', content: this } );
+					if(this.onComplete)this.onComplete();
+				}
 			}
 			
 		}
diff --git a/bin/pixi.js b/bin/pixi.js
index c5c8623..bdebb8e 100644
--- a/bin/pixi.js
+++ b/bin/pixi.js
@@ -31,7 +31,7 @@
 var AjaxRequest=function(){var a=["Msxml2.XMLHTTP","Microsoft.XMLHTTP"];if(window.ActiveXObject)for(var c=0;c<a.length;c++)try{return new ActiveXObject(a[c])}catch(d){}else return window.XMLHttpRequest?new XMLHttpRequest:!1};
 PIXI.EventTarget=function(){var a={};this.addEventListener=function(c,d){void 0===a[c]&&(a[c]=[]);-1===a[c].indexOf(d)&&a[c].push(d)};this.dispatchEvent=function(c){for(var d in a[c.type])a[c.type][d](c)};this.removeEventListener=function(c,d){var f=a[c].indexOf(d);-1!==f&&a[c].splice(f,1)}};
 (function(a,c){"object"===typeof exports?module.exports=c(global):"function"===typeof define&&define.amd?define([],function(){return c(a)}):c(a)})(this,function(a){function c(b){return j=b}function d(){return j="undefined"!==typeof Float32Array?Float32Array:Array}var f={};if("undefined"!=typeof Float32Array){var g=new Float32Array(1),h=new Int32Array(g.buffer);f.invsqrt=function(b){g[0]=b;h[0]=1597463007-(h[0]>>1);var e=g[0];return e*(1.5-0.5*b*e*e)}}else f.invsqrt=function(b){return 1/Math.sqrt(b)};
-var j=null;d();var k={create:function(b){var e=new j(3);b?(e[0]=b[0],e[1]=b[1],e[2]=b[2]):e[0]=e[1]=e[2]=0;return e},createFrom:function(b,e,N){var a=new j(3);a[0]=b;a[1]=e;a[2]=N;return a},set:function(b,e){e[0]=b[0];e[1]=b[1];e[2]=b[2];return e},equal:function(b,e){return b===e||1E-6>Math.abs(b[0]-e[0])&&1E-6>Math.abs(b[1]-e[1])&&1E-6>Math.abs(b[2]-e[2])},add:function(b,e,a){if(!a||b===a)return b[0]+=e[0],b[1]+=e[1],b[2]+=e[2],b;a[0]=b[0]+e[0];a[1]=b[1]+e[1];a[2]=b[2]+e[2];return a},subtract:function(b,
+var j=null;d();var k={create:function(b){var e=new j(3);b?(e[0]=b[0],e[1]=b[1],e[2]=b[2]):e[0]=e[1]=e[2]=0;return e},createFrom:function(b,e,a){var c=new j(3);c[0]=b;c[1]=e;c[2]=a;return c},set:function(b,e){e[0]=b[0];e[1]=b[1];e[2]=b[2];return e},equal:function(b,e){return b===e||1E-6>Math.abs(b[0]-e[0])&&1E-6>Math.abs(b[1]-e[1])&&1E-6>Math.abs(b[2]-e[2])},add:function(b,e,a){if(!a||b===a)return b[0]+=e[0],b[1]+=e[1],b[2]+=e[2],b;a[0]=b[0]+e[0];a[1]=b[1]+e[1];a[2]=b[2]+e[2];return a},subtract:function(b,
 e,a){if(!a||b===a)return b[0]-=e[0],b[1]-=e[1],b[2]-=e[2],b;a[0]=b[0]-e[0];a[1]=b[1]-e[1];a[2]=b[2]-e[2];return a},multiply:function(b,e,a){if(!a||b===a)return b[0]*=e[0],b[1]*=e[1],b[2]*=e[2],b;a[0]=b[0]*e[0];a[1]=b[1]*e[1];a[2]=b[2]*e[2];return a},negate:function(b,e){e||(e=b);e[0]=-b[0];e[1]=-b[1];e[2]=-b[2];return e},scale:function(b,e,a){if(!a||b===a)return b[0]*=e,b[1]*=e,b[2]*=e,b;a[0]=b[0]*e;a[1]=b[1]*e;a[2]=b[2]*e;return a},normalize:function(b,e){e||(e=b);var a=b[0],c=b[1],q=b[2],d=Math.sqrt(a*
 a+c*c+q*q);if(!d)return e[0]=0,e[1]=0,e[2]=0,e;if(1===d)return e[0]=a,e[1]=c,e[2]=q,e;d=1/d;e[0]=a*d;e[1]=c*d;e[2]=q*d;return e},cross:function(b,e,a){a||(a=b);var c=b[0],q=b[1];b=b[2];var d=e[0],f=e[1];e=e[2];a[0]=q*e-b*f;a[1]=b*d-c*e;a[2]=c*f-q*d;return a},length:function(b){var e=b[0],a=b[1];b=b[2];return Math.sqrt(e*e+a*a+b*b)},squaredLength:function(b){var e=b[0],a=b[1];b=b[2];return e*e+a*a+b*b},dot:function(b,e){return b[0]*e[0]+b[1]*e[1]+b[2]*e[2]},direction:function(b,e,a){a||(a=b);var c=
 b[0]-e[0],q=b[1]-e[1];b=b[2]-e[2];e=Math.sqrt(c*c+q*q+b*b);if(!e)return a[0]=0,a[1]=0,a[2]=0,a;e=1/e;a[0]=c*e;a[1]=q*e;a[2]=b*e;return a},lerp:function(b,e,a,c){c||(c=b);c[0]=b[0]+a*(e[0]-b[0]);c[1]=b[1]+a*(e[1]-b[1]);c[2]=b[2]+a*(e[2]-b[2]);return c},dist:function(b,e){var a=e[0]-b[0],c=e[1]-b[1],q=e[2]-b[2];return Math.sqrt(a*a+c*c+q*q)}},r=null,n=new j(4);k.unproject=function(b,e,a,c,q){q||(q=b);r||(r=s.create());var d=r;n[0]=2*(b[0]-c[0])/c[2]-1;n[1]=2*(b[1]-c[1])/c[3]-1;n[2]=2*b[2]-1;n[3]=1;
@@ -41,7 +41,7 @@
 b[7];b=b[8];var j=e[0],k=e[1],l=e[2],p=e[3],m=e[4],t=e[5],n=e[6],w=e[7];e=e[8];a[0]=j*c+k*f+l*v;a[1]=j*q+k*g+l*h;a[2]=j*d+k*H+l*b;a[3]=p*c+m*f+t*v;a[4]=p*q+m*g+t*h;a[5]=p*d+m*H+t*b;a[6]=n*c+w*f+e*v;a[7]=n*q+w*g+e*h;a[8]=n*d+w*H+e*b;return a},multiplyVec2:function(b,e,a){a||(a=e);var c=e[0];e=e[1];a[0]=c*b[0]+e*b[3]+b[6];a[1]=c*b[1]+e*b[4]+b[7];return a},multiplyVec3:function(b,e,a){a||(a=e);var c=e[0],q=e[1];e=e[2];a[0]=c*b[0]+q*b[3]+e*b[6];a[1]=c*b[1]+q*b[4]+e*b[7];a[2]=c*b[2]+q*b[5]+e*b[8];return a},
 set:function(b,e){e[0]=b[0];e[1]=b[1];e[2]=b[2];e[3]=b[3];e[4]=b[4];e[5]=b[5];e[6]=b[6];e[7]=b[7];e[8]=b[8];return e},equal:function(b,e){return b===e||1E-6>Math.abs(b[0]-e[0])&&1E-6>Math.abs(b[1]-e[1])&&1E-6>Math.abs(b[2]-e[2])&&1E-6>Math.abs(b[3]-e[3])&&1E-6>Math.abs(b[4]-e[4])&&1E-6>Math.abs(b[5]-e[5])&&1E-6>Math.abs(b[6]-e[6])&&1E-6>Math.abs(b[7]-e[7])&&1E-6>Math.abs(b[8]-e[8])},identity:function(b){b||(b=y.create());b[0]=1;b[1]=0;b[2]=0;b[3]=0;b[4]=1;b[5]=0;b[6]=0;b[7]=0;b[8]=1;return b},transpose:function(b,
 e){if(!e||b===e){var a=b[1],c=b[2],q=b[5];b[1]=b[3];b[2]=b[6];b[3]=a;b[5]=b[7];b[6]=c;b[7]=q;return b}e[0]=b[0];e[1]=b[3];e[2]=b[6];e[3]=b[1];e[4]=b[4];e[5]=b[7];e[6]=b[2];e[7]=b[5];e[8]=b[8];return e},toMat4:function(b,e){e||(e=s.create());e[15]=1;e[14]=0;e[13]=0;e[12]=0;e[11]=0;e[10]=b[8];e[9]=b[7];e[8]=b[6];e[7]=0;e[6]=b[5];e[5]=b[4];e[4]=b[3];e[3]=0;e[2]=b[2];e[1]=b[1];e[0]=b[0];return e},str:function(b){return"["+b[0]+", "+b[1]+", "+b[2]+", "+b[3]+", "+b[4]+", "+b[5]+", "+b[6]+", "+b[7]+", "+
-b[8]+"]"}},s={create:function(b){var e=new j(16);b&&(e[0]=b[0],e[1]=b[1],e[2]=b[2],e[3]=b[3],e[4]=b[4],e[5]=b[5],e[6]=b[6],e[7]=b[7],e[8]=b[8],e[9]=b[9],e[10]=b[10],e[11]=b[11],e[12]=b[12],e[13]=b[13],e[14]=b[14],e[15]=b[15]);return e},createFrom:function(b,e,a,c,q,d,f,g,h,v,O,I,k,l,p,m){var t=new j(16);t[0]=b;t[1]=e;t[2]=a;t[3]=c;t[4]=q;t[5]=d;t[6]=f;t[7]=g;t[8]=h;t[9]=v;t[10]=O;t[11]=I;t[12]=k;t[13]=l;t[14]=p;t[15]=m;return t},set:function(b,e){e[0]=b[0];e[1]=b[1];e[2]=b[2];e[3]=b[3];e[4]=b[4];
+b[8]+"]"}},s={create:function(b){var e=new j(16);b&&(e[0]=b[0],e[1]=b[1],e[2]=b[2],e[3]=b[3],e[4]=b[4],e[5]=b[5],e[6]=b[6],e[7]=b[7],e[8]=b[8],e[9]=b[9],e[10]=b[10],e[11]=b[11],e[12]=b[12],e[13]=b[13],e[14]=b[14],e[15]=b[15]);return e},createFrom:function(b,e,a,c,q,d,f,g,h,v,N,I,k,l,p,m){var t=new j(16);t[0]=b;t[1]=e;t[2]=a;t[3]=c;t[4]=q;t[5]=d;t[6]=f;t[7]=g;t[8]=h;t[9]=v;t[10]=N;t[11]=I;t[12]=k;t[13]=l;t[14]=p;t[15]=m;return t},set:function(b,e){e[0]=b[0];e[1]=b[1];e[2]=b[2];e[3]=b[3];e[4]=b[4];
 e[5]=b[5];e[6]=b[6];e[7]=b[7];e[8]=b[8];e[9]=b[9];e[10]=b[10];e[11]=b[11];e[12]=b[12];e[13]=b[13];e[14]=b[14];e[15]=b[15];return e},equal:function(b,e){return b===e||1E-6>Math.abs(b[0]-e[0])&&1E-6>Math.abs(b[1]-e[1])&&1E-6>Math.abs(b[2]-e[2])&&1E-6>Math.abs(b[3]-e[3])&&1E-6>Math.abs(b[4]-e[4])&&1E-6>Math.abs(b[5]-e[5])&&1E-6>Math.abs(b[6]-e[6])&&1E-6>Math.abs(b[7]-e[7])&&1E-6>Math.abs(b[8]-e[8])&&1E-6>Math.abs(b[9]-e[9])&&1E-6>Math.abs(b[10]-e[10])&&1E-6>Math.abs(b[11]-e[11])&&1E-6>Math.abs(b[12]-
 e[12])&&1E-6>Math.abs(b[13]-e[13])&&1E-6>Math.abs(b[14]-e[14])&&1E-6>Math.abs(b[15]-e[15])},identity:function(b){b||(b=s.create());b[0]=1;b[1]=0;b[2]=0;b[3]=0;b[4]=0;b[5]=1;b[6]=0;b[7]=0;b[8]=0;b[9]=0;b[10]=1;b[11]=0;b[12]=0;b[13]=0;b[14]=0;b[15]=1;return b},transpose:function(b,e){if(!e||b===e){var a=b[1],c=b[2],q=b[3],d=b[6],f=b[7],g=b[11];b[1]=b[4];b[2]=b[8];b[3]=b[12];b[4]=a;b[6]=b[9];b[7]=b[13];b[8]=c;b[9]=d;b[11]=b[14];b[12]=q;b[13]=f;b[14]=g;return b}e[0]=b[0];e[1]=b[4];e[2]=b[8];e[3]=b[12];
 e[4]=b[1];e[5]=b[5];e[6]=b[9];e[7]=b[13];e[8]=b[2];e[9]=b[6];e[10]=b[10];e[11]=b[14];e[12]=b[3];e[13]=b[7];e[14]=b[11];e[15]=b[15];return e},determinant:function(b){var e=b[0],a=b[1],c=b[2],q=b[3],d=b[4],f=b[5],g=b[6],h=b[7],v=b[8],j=b[9],I=b[10],k=b[11],l=b[12],p=b[13],m=b[14];b=b[15];return l*j*g*q-v*p*g*q-l*f*I*q+d*p*I*q+v*f*m*q-d*j*m*q-l*j*c*h+v*p*c*h+l*a*I*h-e*p*I*h-v*a*m*h+e*j*m*h+l*f*c*k-d*p*c*k-l*a*g*k+e*p*g*k+d*a*m*k-e*f*m*k-v*f*c*b+d*j*c*b+v*a*g*b-e*j*g*b-d*a*I*b+e*f*I*b},inverse:function(b,
@@ -131,12 +131,14 @@
 PIXI.BaseTexture=function(a){PIXI.EventTarget.call(this);this.height=this.width=100;this.source=a;if(this.source instanceof Image)if(this.source.complete)this.hasLoaded=!0,this.width=this.source.width,this.height=this.source.height,PIXI.texturesToUpdate.push(this);else{var c=this;this.source.onload=function(){c.hasLoaded=!0;c.width=c.source.width;c.height=c.source.height;PIXI.texturesToUpdate.push(c);c.dispatchEvent({type:"loaded",content:c})}}else this.hasLoaded=!0,this.width=this.source.width,this.height=
 this.source.height,PIXI.texturesToUpdate.push(this)};PIXI.BaseTexture.constructor=PIXI.BaseTexture;PIXI.BaseTexture.prototype.fromImage=function(){};PIXI.TextureCache={};PIXI.FrameCache={};
 PIXI.Texture=function(a,c){PIXI.EventTarget.call(this);c||(this.noFrame=!0,c=new PIXI.Rectangle(0,0,1,1));this.trim=new PIXI.Point;this.baseTexture=a;this.frame=c;this.scope=this;if(a.hasLoaded)this.noFrame&&(c=new PIXI.Rectangle(0,0,a.width,a.height)),this.setFrame(c);else{var d=this;a.addEventListener("loaded",function(){d.onBaseTextureLoaded()})}};PIXI.Texture.constructor=PIXI.Texture;
-PIXI.Texture.prototype.onBaseTextureLoaded=function(){var a=this.baseTexture;a.removeEventListener("loaded",this.onLoaded);this.noFrame&&(this.frame=new PIXI.Rectangle(0,0,a.width,a.height));this.noFrame=!1;this.width=this.frame.width;this.height=this.frame.height;this.scope.dispatchEvent({type:"update",content:this})};PIXI.Texture.prototype.setFrame=function(a){this.frame=a;this.width=a.width;this.height=a.height};
+PIXI.Texture.prototype.onBaseTextureLoaded=function(){var a=this.baseTexture;a.removeEventListener("loaded",this.onLoaded);this.noFrame&&(this.frame=new PIXI.Rectangle(0,0,a.width,a.height));this.noFrame=!1;this.width=this.frame.width;this.height=this.frame.height;this.scope.dispatchEvent({type:"update",content:this})};
+PIXI.Texture.prototype.setFrame=function(a){this.frame=a;this.width=a.width;this.height=a.height;if(a.x+a.width>this.baseTexture.width||a.y+a.height>this.baseTexture.height)throw Error("Texture Error: frame does not fit inside the base Texture dimensions "+this);};
 PIXI.Texture.fromImage=function(a,c){var d=PIXI.TextureCache[a];d||(d=PIXI.BaseTextureCache[a],d||(d=new Image,c&&(d.crossOrigin=""),d.src=a,d=new PIXI.BaseTexture(d),PIXI.BaseTextureCache[a]=d),d=new PIXI.Texture(d),PIXI.TextureCache[a]=d);return d};PIXI.Texture.fromFrame=function(a){var c=PIXI.TextureCache[a];if(!c)throw Error("The frameId '"+a+"' does not exist in the texture cache "+this);return c};
 PIXI.Texture.fromCanvas=function(a){var c=PIXI.TextureCache[a];c||(c=PIXI.BaseTextureCache[a],c||(c=new PIXI.BaseTexture(a),PIXI.BaseTextureCache[a]=c),c=new PIXI.Texture(c),PIXI.TextureCache[a]=c);return c};PIXI.Texture.addTextureToCache=function(a,c){PIXI.TextureCache[c]=a};PIXI.Texture.removeTextureFromCache=function(a){var c=PIXI.TextureCache[a];PIXI.TextureCache[a]=null;return c};
 PIXI.SpriteSheetLoader=function(a){PIXI.EventTarget.call(this);this.url=a;this.baseUrl=a.replace(/[^\/]*$/,"");this.texture;this.frames={};this.crossorigin=!1};PIXI.SpriteSheetLoader.constructor=PIXI.SpriteSheetLoader;
 PIXI.SpriteSheetLoader.prototype.load=function(){this.ajaxRequest=new AjaxRequest;var a=this;this.ajaxRequest.onreadystatechange=function(){a.onLoaded()};this.ajaxRequest.open("GET",this.url,!0);this.ajaxRequest.overrideMimeType&&this.ajaxRequest.overrideMimeType("application/json");this.ajaxRequest.send(null)};
 PIXI.SpriteSheetLoader.prototype.onLoaded=function(){if(4==this.ajaxRequest.readyState&&(200==this.ajaxRequest.status||-1==window.location.href.indexOf("http"))){var a=eval("("+this.ajaxRequest.responseText+")");this.texture=PIXI.Texture.fromImage(this.baseUrl+a.meta.image,this.crossorigin).baseTexture;var a=a.frames,c;for(c in a){var d=a[c].frame;PIXI.TextureCache[c]=new PIXI.Texture(this.texture,{x:d.x,y:d.y,width:d.w,height:d.h});a[c].trimmed&&(PIXI.TextureCache[c].realSize=a[c].spriteSourceSize,
 PIXI.TextureCache[c].trim.x=0)}if(this.texture.hasLoaded)this.dispatchEvent({type:"loaded",content:this});else{var f=this;this.texture.addEventListener("loaded",function(){f.dispatchEvent({type:"loaded",content:f})})}}};PIXI.AssetLoader=function(a){PIXI.EventTarget.call(this);this.assetURLs=a;this.assets=[];this.crossorigin=!1};PIXI.AssetLoader.constructor=PIXI.AssetLoader;
-PIXI.AssetLoader.prototype.load=function(){this.loadCount=this.assetURLs.length;for(var a=["jpeg","jpg","png","gif"],c=["json"],d=0;d<this.assetURLs.length;d++){for(var f=this.assetURLs[d],g=f.split(".").pop().toLowerCase(),h=null,j=0;j<a.length;j++)if(g==a[j]){h="img";break}if("img"!=h)for(j=0;j<c.length;j++)if(g==c[j]){h="atlas";break}if("img"==h)if(f=PIXI.Texture.fromImage(f,this.crossorigin),f.hasLoaded)this.loadCount--;else{var k=this;f.baseTexture.addEventListener("loaded",function(){k.onAssetLoaded()});
-this.assets.push(f)}else if("atlas"==h)f=new PIXI.SpriteSheetLoader(f),f.crossorigin=this.crossorigin,this.assets.push(f),k=this,f.addEventListener("loaded",function(){k.onAssetLoaded()}),f.load();else throw Error(f+" is an unsupported file type "+this);}};PIXI.AssetLoader.prototype.onAssetLoaded=function(){this.loadCount--;this.dispatchEvent({type:"onProgress",content:this});if(this.onProgress)this.onProgress();if(0==this.loadCount&&(this.dispatchEvent({type:"onComplete",content:this}),this.onComplete))this.onComplete()};
\ No newline at end of file
+PIXI.AssetLoader.prototype.load=function(){this.loadCount=this.assetURLs.length;for(var a=["jpeg","jpg","png","gif"],c=["json"],d=0;d<this.assetURLs.length;d++){for(var f=this.assetURLs[d],g=f.split(".").pop().toLowerCase(),h=null,j=0;j<a.length;j++)if(g==a[j]){h="img";break}if("img"!=h)for(j=0;j<c.length;j++)if(g==c[j]){h="atlas";break}if("img"==h)if(f=PIXI.Texture.fromImage(f,this.crossorigin),f.baseTexture.hasLoaded){if(this.loadCount--,0==this.loadCount&&(this.dispatchEvent({type:"onComplete",
+content:this}),this.onComplete))this.onComplete()}else{var k=this;f.baseTexture.addEventListener("loaded",function(){k.onAssetLoaded()});this.assets.push(f)}else if("atlas"==h)f=new PIXI.SpriteSheetLoader(f),f.crossorigin=this.crossorigin,this.assets.push(f),k=this,f.addEventListener("loaded",function(){k.onAssetLoaded()}),f.load();else throw Error(f+" is an unsupported file type "+this);}};
+PIXI.AssetLoader.prototype.onAssetLoaded=function(){this.loadCount--;this.dispatchEvent({type:"onProgress",content:this});if(this.onProgress)this.onProgress();if(0==this.loadCount&&(this.dispatchEvent({type:"onComplete",content:this}),this.onComplete))this.onComplete()};
\ No newline at end of file

diff --git a/bin/pixi.dev.js b/bin/pixi.dev.js
index ad04473..542a82c 100644
--- a/bin/pixi.dev.js
+++ b/bin/pixi.dev.js
@@ -3369,6 +3369,11 @@
 	this.frame = frame;
 	this.width = frame.width;
 	this.height = frame.height;
+	
+	if(frame.x + frame.width > this.baseTexture.width || frame.y + frame.height > this.baseTexture.height)
+	{
+		throw new Error("Texture Error: frame does not fit inside the base Texture dimensions " + this);
+	}
 	//this.updateFrame = true;
 }
 
@@ -3396,7 +3401,6 @@
 				image.crossOrigin = '';
 			}
 			image.src = imageUrl;
-			
 			baseTexture = new PIXI.BaseTexture(image);
 			PIXI.BaseTextureCache[imageUrl] = baseTexture;
 		}
@@ -3669,7 +3673,7 @@
 		{
 			
 			var texture = PIXI.Texture.fromImage(filename, this.crossorigin);
-			if(!texture.hasLoaded)
+			if(!texture.baseTexture.hasLoaded)
 			{
 				
 				var scope = this;
@@ -3685,6 +3689,12 @@
 				
 				// already loaded!
 				this.loadCount--;
+				// if this hits zero here.. then everything was cached!
+				if(this.loadCount == 0)
+				{
+					this.dispatchEvent( { type: 'onComplete', content: this } );
+					if(this.onComplete)this.onComplete();
+				}
 			}
 			
 		}
diff --git a/bin/pixi.js b/bin/pixi.js
index c5c8623..bdebb8e 100644
--- a/bin/pixi.js
+++ b/bin/pixi.js
@@ -31,7 +31,7 @@
 var AjaxRequest=function(){var a=["Msxml2.XMLHTTP","Microsoft.XMLHTTP"];if(window.ActiveXObject)for(var c=0;c<a.length;c++)try{return new ActiveXObject(a[c])}catch(d){}else return window.XMLHttpRequest?new XMLHttpRequest:!1};
 PIXI.EventTarget=function(){var a={};this.addEventListener=function(c,d){void 0===a[c]&&(a[c]=[]);-1===a[c].indexOf(d)&&a[c].push(d)};this.dispatchEvent=function(c){for(var d in a[c.type])a[c.type][d](c)};this.removeEventListener=function(c,d){var f=a[c].indexOf(d);-1!==f&&a[c].splice(f,1)}};
 (function(a,c){"object"===typeof exports?module.exports=c(global):"function"===typeof define&&define.amd?define([],function(){return c(a)}):c(a)})(this,function(a){function c(b){return j=b}function d(){return j="undefined"!==typeof Float32Array?Float32Array:Array}var f={};if("undefined"!=typeof Float32Array){var g=new Float32Array(1),h=new Int32Array(g.buffer);f.invsqrt=function(b){g[0]=b;h[0]=1597463007-(h[0]>>1);var e=g[0];return e*(1.5-0.5*b*e*e)}}else f.invsqrt=function(b){return 1/Math.sqrt(b)};
-var j=null;d();var k={create:function(b){var e=new j(3);b?(e[0]=b[0],e[1]=b[1],e[2]=b[2]):e[0]=e[1]=e[2]=0;return e},createFrom:function(b,e,N){var a=new j(3);a[0]=b;a[1]=e;a[2]=N;return a},set:function(b,e){e[0]=b[0];e[1]=b[1];e[2]=b[2];return e},equal:function(b,e){return b===e||1E-6>Math.abs(b[0]-e[0])&&1E-6>Math.abs(b[1]-e[1])&&1E-6>Math.abs(b[2]-e[2])},add:function(b,e,a){if(!a||b===a)return b[0]+=e[0],b[1]+=e[1],b[2]+=e[2],b;a[0]=b[0]+e[0];a[1]=b[1]+e[1];a[2]=b[2]+e[2];return a},subtract:function(b,
+var j=null;d();var k={create:function(b){var e=new j(3);b?(e[0]=b[0],e[1]=b[1],e[2]=b[2]):e[0]=e[1]=e[2]=0;return e},createFrom:function(b,e,a){var c=new j(3);c[0]=b;c[1]=e;c[2]=a;return c},set:function(b,e){e[0]=b[0];e[1]=b[1];e[2]=b[2];return e},equal:function(b,e){return b===e||1E-6>Math.abs(b[0]-e[0])&&1E-6>Math.abs(b[1]-e[1])&&1E-6>Math.abs(b[2]-e[2])},add:function(b,e,a){if(!a||b===a)return b[0]+=e[0],b[1]+=e[1],b[2]+=e[2],b;a[0]=b[0]+e[0];a[1]=b[1]+e[1];a[2]=b[2]+e[2];return a},subtract:function(b,
 e,a){if(!a||b===a)return b[0]-=e[0],b[1]-=e[1],b[2]-=e[2],b;a[0]=b[0]-e[0];a[1]=b[1]-e[1];a[2]=b[2]-e[2];return a},multiply:function(b,e,a){if(!a||b===a)return b[0]*=e[0],b[1]*=e[1],b[2]*=e[2],b;a[0]=b[0]*e[0];a[1]=b[1]*e[1];a[2]=b[2]*e[2];return a},negate:function(b,e){e||(e=b);e[0]=-b[0];e[1]=-b[1];e[2]=-b[2];return e},scale:function(b,e,a){if(!a||b===a)return b[0]*=e,b[1]*=e,b[2]*=e,b;a[0]=b[0]*e;a[1]=b[1]*e;a[2]=b[2]*e;return a},normalize:function(b,e){e||(e=b);var a=b[0],c=b[1],q=b[2],d=Math.sqrt(a*
 a+c*c+q*q);if(!d)return e[0]=0,e[1]=0,e[2]=0,e;if(1===d)return e[0]=a,e[1]=c,e[2]=q,e;d=1/d;e[0]=a*d;e[1]=c*d;e[2]=q*d;return e},cross:function(b,e,a){a||(a=b);var c=b[0],q=b[1];b=b[2];var d=e[0],f=e[1];e=e[2];a[0]=q*e-b*f;a[1]=b*d-c*e;a[2]=c*f-q*d;return a},length:function(b){var e=b[0],a=b[1];b=b[2];return Math.sqrt(e*e+a*a+b*b)},squaredLength:function(b){var e=b[0],a=b[1];b=b[2];return e*e+a*a+b*b},dot:function(b,e){return b[0]*e[0]+b[1]*e[1]+b[2]*e[2]},direction:function(b,e,a){a||(a=b);var c=
 b[0]-e[0],q=b[1]-e[1];b=b[2]-e[2];e=Math.sqrt(c*c+q*q+b*b);if(!e)return a[0]=0,a[1]=0,a[2]=0,a;e=1/e;a[0]=c*e;a[1]=q*e;a[2]=b*e;return a},lerp:function(b,e,a,c){c||(c=b);c[0]=b[0]+a*(e[0]-b[0]);c[1]=b[1]+a*(e[1]-b[1]);c[2]=b[2]+a*(e[2]-b[2]);return c},dist:function(b,e){var a=e[0]-b[0],c=e[1]-b[1],q=e[2]-b[2];return Math.sqrt(a*a+c*c+q*q)}},r=null,n=new j(4);k.unproject=function(b,e,a,c,q){q||(q=b);r||(r=s.create());var d=r;n[0]=2*(b[0]-c[0])/c[2]-1;n[1]=2*(b[1]-c[1])/c[3]-1;n[2]=2*b[2]-1;n[3]=1;
@@ -41,7 +41,7 @@
 b[7];b=b[8];var j=e[0],k=e[1],l=e[2],p=e[3],m=e[4],t=e[5],n=e[6],w=e[7];e=e[8];a[0]=j*c+k*f+l*v;a[1]=j*q+k*g+l*h;a[2]=j*d+k*H+l*b;a[3]=p*c+m*f+t*v;a[4]=p*q+m*g+t*h;a[5]=p*d+m*H+t*b;a[6]=n*c+w*f+e*v;a[7]=n*q+w*g+e*h;a[8]=n*d+w*H+e*b;return a},multiplyVec2:function(b,e,a){a||(a=e);var c=e[0];e=e[1];a[0]=c*b[0]+e*b[3]+b[6];a[1]=c*b[1]+e*b[4]+b[7];return a},multiplyVec3:function(b,e,a){a||(a=e);var c=e[0],q=e[1];e=e[2];a[0]=c*b[0]+q*b[3]+e*b[6];a[1]=c*b[1]+q*b[4]+e*b[7];a[2]=c*b[2]+q*b[5]+e*b[8];return a},
 set:function(b,e){e[0]=b[0];e[1]=b[1];e[2]=b[2];e[3]=b[3];e[4]=b[4];e[5]=b[5];e[6]=b[6];e[7]=b[7];e[8]=b[8];return e},equal:function(b,e){return b===e||1E-6>Math.abs(b[0]-e[0])&&1E-6>Math.abs(b[1]-e[1])&&1E-6>Math.abs(b[2]-e[2])&&1E-6>Math.abs(b[3]-e[3])&&1E-6>Math.abs(b[4]-e[4])&&1E-6>Math.abs(b[5]-e[5])&&1E-6>Math.abs(b[6]-e[6])&&1E-6>Math.abs(b[7]-e[7])&&1E-6>Math.abs(b[8]-e[8])},identity:function(b){b||(b=y.create());b[0]=1;b[1]=0;b[2]=0;b[3]=0;b[4]=1;b[5]=0;b[6]=0;b[7]=0;b[8]=1;return b},transpose:function(b,
 e){if(!e||b===e){var a=b[1],c=b[2],q=b[5];b[1]=b[3];b[2]=b[6];b[3]=a;b[5]=b[7];b[6]=c;b[7]=q;return b}e[0]=b[0];e[1]=b[3];e[2]=b[6];e[3]=b[1];e[4]=b[4];e[5]=b[7];e[6]=b[2];e[7]=b[5];e[8]=b[8];return e},toMat4:function(b,e){e||(e=s.create());e[15]=1;e[14]=0;e[13]=0;e[12]=0;e[11]=0;e[10]=b[8];e[9]=b[7];e[8]=b[6];e[7]=0;e[6]=b[5];e[5]=b[4];e[4]=b[3];e[3]=0;e[2]=b[2];e[1]=b[1];e[0]=b[0];return e},str:function(b){return"["+b[0]+", "+b[1]+", "+b[2]+", "+b[3]+", "+b[4]+", "+b[5]+", "+b[6]+", "+b[7]+", "+
-b[8]+"]"}},s={create:function(b){var e=new j(16);b&&(e[0]=b[0],e[1]=b[1],e[2]=b[2],e[3]=b[3],e[4]=b[4],e[5]=b[5],e[6]=b[6],e[7]=b[7],e[8]=b[8],e[9]=b[9],e[10]=b[10],e[11]=b[11],e[12]=b[12],e[13]=b[13],e[14]=b[14],e[15]=b[15]);return e},createFrom:function(b,e,a,c,q,d,f,g,h,v,O,I,k,l,p,m){var t=new j(16);t[0]=b;t[1]=e;t[2]=a;t[3]=c;t[4]=q;t[5]=d;t[6]=f;t[7]=g;t[8]=h;t[9]=v;t[10]=O;t[11]=I;t[12]=k;t[13]=l;t[14]=p;t[15]=m;return t},set:function(b,e){e[0]=b[0];e[1]=b[1];e[2]=b[2];e[3]=b[3];e[4]=b[4];
+b[8]+"]"}},s={create:function(b){var e=new j(16);b&&(e[0]=b[0],e[1]=b[1],e[2]=b[2],e[3]=b[3],e[4]=b[4],e[5]=b[5],e[6]=b[6],e[7]=b[7],e[8]=b[8],e[9]=b[9],e[10]=b[10],e[11]=b[11],e[12]=b[12],e[13]=b[13],e[14]=b[14],e[15]=b[15]);return e},createFrom:function(b,e,a,c,q,d,f,g,h,v,N,I,k,l,p,m){var t=new j(16);t[0]=b;t[1]=e;t[2]=a;t[3]=c;t[4]=q;t[5]=d;t[6]=f;t[7]=g;t[8]=h;t[9]=v;t[10]=N;t[11]=I;t[12]=k;t[13]=l;t[14]=p;t[15]=m;return t},set:function(b,e){e[0]=b[0];e[1]=b[1];e[2]=b[2];e[3]=b[3];e[4]=b[4];
 e[5]=b[5];e[6]=b[6];e[7]=b[7];e[8]=b[8];e[9]=b[9];e[10]=b[10];e[11]=b[11];e[12]=b[12];e[13]=b[13];e[14]=b[14];e[15]=b[15];return e},equal:function(b,e){return b===e||1E-6>Math.abs(b[0]-e[0])&&1E-6>Math.abs(b[1]-e[1])&&1E-6>Math.abs(b[2]-e[2])&&1E-6>Math.abs(b[3]-e[3])&&1E-6>Math.abs(b[4]-e[4])&&1E-6>Math.abs(b[5]-e[5])&&1E-6>Math.abs(b[6]-e[6])&&1E-6>Math.abs(b[7]-e[7])&&1E-6>Math.abs(b[8]-e[8])&&1E-6>Math.abs(b[9]-e[9])&&1E-6>Math.abs(b[10]-e[10])&&1E-6>Math.abs(b[11]-e[11])&&1E-6>Math.abs(b[12]-
 e[12])&&1E-6>Math.abs(b[13]-e[13])&&1E-6>Math.abs(b[14]-e[14])&&1E-6>Math.abs(b[15]-e[15])},identity:function(b){b||(b=s.create());b[0]=1;b[1]=0;b[2]=0;b[3]=0;b[4]=0;b[5]=1;b[6]=0;b[7]=0;b[8]=0;b[9]=0;b[10]=1;b[11]=0;b[12]=0;b[13]=0;b[14]=0;b[15]=1;return b},transpose:function(b,e){if(!e||b===e){var a=b[1],c=b[2],q=b[3],d=b[6],f=b[7],g=b[11];b[1]=b[4];b[2]=b[8];b[3]=b[12];b[4]=a;b[6]=b[9];b[7]=b[13];b[8]=c;b[9]=d;b[11]=b[14];b[12]=q;b[13]=f;b[14]=g;return b}e[0]=b[0];e[1]=b[4];e[2]=b[8];e[3]=b[12];
 e[4]=b[1];e[5]=b[5];e[6]=b[9];e[7]=b[13];e[8]=b[2];e[9]=b[6];e[10]=b[10];e[11]=b[14];e[12]=b[3];e[13]=b[7];e[14]=b[11];e[15]=b[15];return e},determinant:function(b){var e=b[0],a=b[1],c=b[2],q=b[3],d=b[4],f=b[5],g=b[6],h=b[7],v=b[8],j=b[9],I=b[10],k=b[11],l=b[12],p=b[13],m=b[14];b=b[15];return l*j*g*q-v*p*g*q-l*f*I*q+d*p*I*q+v*f*m*q-d*j*m*q-l*j*c*h+v*p*c*h+l*a*I*h-e*p*I*h-v*a*m*h+e*j*m*h+l*f*c*k-d*p*c*k-l*a*g*k+e*p*g*k+d*a*m*k-e*f*m*k-v*f*c*b+d*j*c*b+v*a*g*b-e*j*g*b-d*a*I*b+e*f*I*b},inverse:function(b,
@@ -131,12 +131,14 @@
 PIXI.BaseTexture=function(a){PIXI.EventTarget.call(this);this.height=this.width=100;this.source=a;if(this.source instanceof Image)if(this.source.complete)this.hasLoaded=!0,this.width=this.source.width,this.height=this.source.height,PIXI.texturesToUpdate.push(this);else{var c=this;this.source.onload=function(){c.hasLoaded=!0;c.width=c.source.width;c.height=c.source.height;PIXI.texturesToUpdate.push(c);c.dispatchEvent({type:"loaded",content:c})}}else this.hasLoaded=!0,this.width=this.source.width,this.height=
 this.source.height,PIXI.texturesToUpdate.push(this)};PIXI.BaseTexture.constructor=PIXI.BaseTexture;PIXI.BaseTexture.prototype.fromImage=function(){};PIXI.TextureCache={};PIXI.FrameCache={};
 PIXI.Texture=function(a,c){PIXI.EventTarget.call(this);c||(this.noFrame=!0,c=new PIXI.Rectangle(0,0,1,1));this.trim=new PIXI.Point;this.baseTexture=a;this.frame=c;this.scope=this;if(a.hasLoaded)this.noFrame&&(c=new PIXI.Rectangle(0,0,a.width,a.height)),this.setFrame(c);else{var d=this;a.addEventListener("loaded",function(){d.onBaseTextureLoaded()})}};PIXI.Texture.constructor=PIXI.Texture;
-PIXI.Texture.prototype.onBaseTextureLoaded=function(){var a=this.baseTexture;a.removeEventListener("loaded",this.onLoaded);this.noFrame&&(this.frame=new PIXI.Rectangle(0,0,a.width,a.height));this.noFrame=!1;this.width=this.frame.width;this.height=this.frame.height;this.scope.dispatchEvent({type:"update",content:this})};PIXI.Texture.prototype.setFrame=function(a){this.frame=a;this.width=a.width;this.height=a.height};
+PIXI.Texture.prototype.onBaseTextureLoaded=function(){var a=this.baseTexture;a.removeEventListener("loaded",this.onLoaded);this.noFrame&&(this.frame=new PIXI.Rectangle(0,0,a.width,a.height));this.noFrame=!1;this.width=this.frame.width;this.height=this.frame.height;this.scope.dispatchEvent({type:"update",content:this})};
+PIXI.Texture.prototype.setFrame=function(a){this.frame=a;this.width=a.width;this.height=a.height;if(a.x+a.width>this.baseTexture.width||a.y+a.height>this.baseTexture.height)throw Error("Texture Error: frame does not fit inside the base Texture dimensions "+this);};
 PIXI.Texture.fromImage=function(a,c){var d=PIXI.TextureCache[a];d||(d=PIXI.BaseTextureCache[a],d||(d=new Image,c&&(d.crossOrigin=""),d.src=a,d=new PIXI.BaseTexture(d),PIXI.BaseTextureCache[a]=d),d=new PIXI.Texture(d),PIXI.TextureCache[a]=d);return d};PIXI.Texture.fromFrame=function(a){var c=PIXI.TextureCache[a];if(!c)throw Error("The frameId '"+a+"' does not exist in the texture cache "+this);return c};
 PIXI.Texture.fromCanvas=function(a){var c=PIXI.TextureCache[a];c||(c=PIXI.BaseTextureCache[a],c||(c=new PIXI.BaseTexture(a),PIXI.BaseTextureCache[a]=c),c=new PIXI.Texture(c),PIXI.TextureCache[a]=c);return c};PIXI.Texture.addTextureToCache=function(a,c){PIXI.TextureCache[c]=a};PIXI.Texture.removeTextureFromCache=function(a){var c=PIXI.TextureCache[a];PIXI.TextureCache[a]=null;return c};
 PIXI.SpriteSheetLoader=function(a){PIXI.EventTarget.call(this);this.url=a;this.baseUrl=a.replace(/[^\/]*$/,"");this.texture;this.frames={};this.crossorigin=!1};PIXI.SpriteSheetLoader.constructor=PIXI.SpriteSheetLoader;
 PIXI.SpriteSheetLoader.prototype.load=function(){this.ajaxRequest=new AjaxRequest;var a=this;this.ajaxRequest.onreadystatechange=function(){a.onLoaded()};this.ajaxRequest.open("GET",this.url,!0);this.ajaxRequest.overrideMimeType&&this.ajaxRequest.overrideMimeType("application/json");this.ajaxRequest.send(null)};
 PIXI.SpriteSheetLoader.prototype.onLoaded=function(){if(4==this.ajaxRequest.readyState&&(200==this.ajaxRequest.status||-1==window.location.href.indexOf("http"))){var a=eval("("+this.ajaxRequest.responseText+")");this.texture=PIXI.Texture.fromImage(this.baseUrl+a.meta.image,this.crossorigin).baseTexture;var a=a.frames,c;for(c in a){var d=a[c].frame;PIXI.TextureCache[c]=new PIXI.Texture(this.texture,{x:d.x,y:d.y,width:d.w,height:d.h});a[c].trimmed&&(PIXI.TextureCache[c].realSize=a[c].spriteSourceSize,
 PIXI.TextureCache[c].trim.x=0)}if(this.texture.hasLoaded)this.dispatchEvent({type:"loaded",content:this});else{var f=this;this.texture.addEventListener("loaded",function(){f.dispatchEvent({type:"loaded",content:f})})}}};PIXI.AssetLoader=function(a){PIXI.EventTarget.call(this);this.assetURLs=a;this.assets=[];this.crossorigin=!1};PIXI.AssetLoader.constructor=PIXI.AssetLoader;
-PIXI.AssetLoader.prototype.load=function(){this.loadCount=this.assetURLs.length;for(var a=["jpeg","jpg","png","gif"],c=["json"],d=0;d<this.assetURLs.length;d++){for(var f=this.assetURLs[d],g=f.split(".").pop().toLowerCase(),h=null,j=0;j<a.length;j++)if(g==a[j]){h="img";break}if("img"!=h)for(j=0;j<c.length;j++)if(g==c[j]){h="atlas";break}if("img"==h)if(f=PIXI.Texture.fromImage(f,this.crossorigin),f.hasLoaded)this.loadCount--;else{var k=this;f.baseTexture.addEventListener("loaded",function(){k.onAssetLoaded()});
-this.assets.push(f)}else if("atlas"==h)f=new PIXI.SpriteSheetLoader(f),f.crossorigin=this.crossorigin,this.assets.push(f),k=this,f.addEventListener("loaded",function(){k.onAssetLoaded()}),f.load();else throw Error(f+" is an unsupported file type "+this);}};PIXI.AssetLoader.prototype.onAssetLoaded=function(){this.loadCount--;this.dispatchEvent({type:"onProgress",content:this});if(this.onProgress)this.onProgress();if(0==this.loadCount&&(this.dispatchEvent({type:"onComplete",content:this}),this.onComplete))this.onComplete()};
\ No newline at end of file
+PIXI.AssetLoader.prototype.load=function(){this.loadCount=this.assetURLs.length;for(var a=["jpeg","jpg","png","gif"],c=["json"],d=0;d<this.assetURLs.length;d++){for(var f=this.assetURLs[d],g=f.split(".").pop().toLowerCase(),h=null,j=0;j<a.length;j++)if(g==a[j]){h="img";break}if("img"!=h)for(j=0;j<c.length;j++)if(g==c[j]){h="atlas";break}if("img"==h)if(f=PIXI.Texture.fromImage(f,this.crossorigin),f.baseTexture.hasLoaded){if(this.loadCount--,0==this.loadCount&&(this.dispatchEvent({type:"onComplete",
+content:this}),this.onComplete))this.onComplete()}else{var k=this;f.baseTexture.addEventListener("loaded",function(){k.onAssetLoaded()});this.assets.push(f)}else if("atlas"==h)f=new PIXI.SpriteSheetLoader(f),f.crossorigin=this.crossorigin,this.assets.push(f),k=this,f.addEventListener("loaded",function(){k.onAssetLoaded()}),f.load();else throw Error(f+" is an unsupported file type "+this);}};
+PIXI.AssetLoader.prototype.onAssetLoaded=function(){this.loadCount--;this.dispatchEvent({type:"onProgress",content:this});if(this.onProgress)this.onProgress();if(0==this.loadCount&&(this.dispatchEvent({type:"onComplete",content:this}),this.onComplete))this.onComplete()};
\ No newline at end of file
diff --git a/src/pixi/loaders/AssetLoader.js b/src/pixi/loaders/AssetLoader.js
index 5e3fbf3..7484590 100644
--- a/src/pixi/loaders/AssetLoader.js
+++ b/src/pixi/loaders/AssetLoader.js
@@ -82,7 +82,7 @@
 		{
 			
 			var texture = PIXI.Texture.fromImage(filename, this.crossorigin);
-			if(!texture.hasLoaded)
+			if(!texture.baseTexture.hasLoaded)
 			{
 				
 				var scope = this;
@@ -98,6 +98,12 @@
 				
 				// already loaded!
 				this.loadCount--;
+				// if this hits zero here.. then everything was cached!
+				if(this.loadCount == 0)
+				{
+					this.dispatchEvent( { type: 'onComplete', content: this } );
+					if(this.onComplete)this.onComplete();
+				}
 			}
 			
 		}

diff --git a/bin/pixi.dev.js b/bin/pixi.dev.js
index ad04473..542a82c 100644
--- a/bin/pixi.dev.js
+++ b/bin/pixi.dev.js
@@ -3369,6 +3369,11 @@
 	this.frame = frame;
 	this.width = frame.width;
 	this.height = frame.height;
+	
+	if(frame.x + frame.width > this.baseTexture.width || frame.y + frame.height > this.baseTexture.height)
+	{
+		throw new Error("Texture Error: frame does not fit inside the base Texture dimensions " + this);
+	}
 	//this.updateFrame = true;
 }
 
@@ -3396,7 +3401,6 @@
 				image.crossOrigin = '';
 			}
 			image.src = imageUrl;
-			
 			baseTexture = new PIXI.BaseTexture(image);
 			PIXI.BaseTextureCache[imageUrl] = baseTexture;
 		}
@@ -3669,7 +3673,7 @@
 		{
 			
 			var texture = PIXI.Texture.fromImage(filename, this.crossorigin);
-			if(!texture.hasLoaded)
+			if(!texture.baseTexture.hasLoaded)
 			{
 				
 				var scope = this;
@@ -3685,6 +3689,12 @@
 				
 				// already loaded!
 				this.loadCount--;
+				// if this hits zero here.. then everything was cached!
+				if(this.loadCount == 0)
+				{
+					this.dispatchEvent( { type: 'onComplete', content: this } );
+					if(this.onComplete)this.onComplete();
+				}
 			}
 			
 		}
diff --git a/bin/pixi.js b/bin/pixi.js
index c5c8623..bdebb8e 100644
--- a/bin/pixi.js
+++ b/bin/pixi.js
@@ -31,7 +31,7 @@
 var AjaxRequest=function(){var a=["Msxml2.XMLHTTP","Microsoft.XMLHTTP"];if(window.ActiveXObject)for(var c=0;c<a.length;c++)try{return new ActiveXObject(a[c])}catch(d){}else return window.XMLHttpRequest?new XMLHttpRequest:!1};
 PIXI.EventTarget=function(){var a={};this.addEventListener=function(c,d){void 0===a[c]&&(a[c]=[]);-1===a[c].indexOf(d)&&a[c].push(d)};this.dispatchEvent=function(c){for(var d in a[c.type])a[c.type][d](c)};this.removeEventListener=function(c,d){var f=a[c].indexOf(d);-1!==f&&a[c].splice(f,1)}};
 (function(a,c){"object"===typeof exports?module.exports=c(global):"function"===typeof define&&define.amd?define([],function(){return c(a)}):c(a)})(this,function(a){function c(b){return j=b}function d(){return j="undefined"!==typeof Float32Array?Float32Array:Array}var f={};if("undefined"!=typeof Float32Array){var g=new Float32Array(1),h=new Int32Array(g.buffer);f.invsqrt=function(b){g[0]=b;h[0]=1597463007-(h[0]>>1);var e=g[0];return e*(1.5-0.5*b*e*e)}}else f.invsqrt=function(b){return 1/Math.sqrt(b)};
-var j=null;d();var k={create:function(b){var e=new j(3);b?(e[0]=b[0],e[1]=b[1],e[2]=b[2]):e[0]=e[1]=e[2]=0;return e},createFrom:function(b,e,N){var a=new j(3);a[0]=b;a[1]=e;a[2]=N;return a},set:function(b,e){e[0]=b[0];e[1]=b[1];e[2]=b[2];return e},equal:function(b,e){return b===e||1E-6>Math.abs(b[0]-e[0])&&1E-6>Math.abs(b[1]-e[1])&&1E-6>Math.abs(b[2]-e[2])},add:function(b,e,a){if(!a||b===a)return b[0]+=e[0],b[1]+=e[1],b[2]+=e[2],b;a[0]=b[0]+e[0];a[1]=b[1]+e[1];a[2]=b[2]+e[2];return a},subtract:function(b,
+var j=null;d();var k={create:function(b){var e=new j(3);b?(e[0]=b[0],e[1]=b[1],e[2]=b[2]):e[0]=e[1]=e[2]=0;return e},createFrom:function(b,e,a){var c=new j(3);c[0]=b;c[1]=e;c[2]=a;return c},set:function(b,e){e[0]=b[0];e[1]=b[1];e[2]=b[2];return e},equal:function(b,e){return b===e||1E-6>Math.abs(b[0]-e[0])&&1E-6>Math.abs(b[1]-e[1])&&1E-6>Math.abs(b[2]-e[2])},add:function(b,e,a){if(!a||b===a)return b[0]+=e[0],b[1]+=e[1],b[2]+=e[2],b;a[0]=b[0]+e[0];a[1]=b[1]+e[1];a[2]=b[2]+e[2];return a},subtract:function(b,
 e,a){if(!a||b===a)return b[0]-=e[0],b[1]-=e[1],b[2]-=e[2],b;a[0]=b[0]-e[0];a[1]=b[1]-e[1];a[2]=b[2]-e[2];return a},multiply:function(b,e,a){if(!a||b===a)return b[0]*=e[0],b[1]*=e[1],b[2]*=e[2],b;a[0]=b[0]*e[0];a[1]=b[1]*e[1];a[2]=b[2]*e[2];return a},negate:function(b,e){e||(e=b);e[0]=-b[0];e[1]=-b[1];e[2]=-b[2];return e},scale:function(b,e,a){if(!a||b===a)return b[0]*=e,b[1]*=e,b[2]*=e,b;a[0]=b[0]*e;a[1]=b[1]*e;a[2]=b[2]*e;return a},normalize:function(b,e){e||(e=b);var a=b[0],c=b[1],q=b[2],d=Math.sqrt(a*
 a+c*c+q*q);if(!d)return e[0]=0,e[1]=0,e[2]=0,e;if(1===d)return e[0]=a,e[1]=c,e[2]=q,e;d=1/d;e[0]=a*d;e[1]=c*d;e[2]=q*d;return e},cross:function(b,e,a){a||(a=b);var c=b[0],q=b[1];b=b[2];var d=e[0],f=e[1];e=e[2];a[0]=q*e-b*f;a[1]=b*d-c*e;a[2]=c*f-q*d;return a},length:function(b){var e=b[0],a=b[1];b=b[2];return Math.sqrt(e*e+a*a+b*b)},squaredLength:function(b){var e=b[0],a=b[1];b=b[2];return e*e+a*a+b*b},dot:function(b,e){return b[0]*e[0]+b[1]*e[1]+b[2]*e[2]},direction:function(b,e,a){a||(a=b);var c=
 b[0]-e[0],q=b[1]-e[1];b=b[2]-e[2];e=Math.sqrt(c*c+q*q+b*b);if(!e)return a[0]=0,a[1]=0,a[2]=0,a;e=1/e;a[0]=c*e;a[1]=q*e;a[2]=b*e;return a},lerp:function(b,e,a,c){c||(c=b);c[0]=b[0]+a*(e[0]-b[0]);c[1]=b[1]+a*(e[1]-b[1]);c[2]=b[2]+a*(e[2]-b[2]);return c},dist:function(b,e){var a=e[0]-b[0],c=e[1]-b[1],q=e[2]-b[2];return Math.sqrt(a*a+c*c+q*q)}},r=null,n=new j(4);k.unproject=function(b,e,a,c,q){q||(q=b);r||(r=s.create());var d=r;n[0]=2*(b[0]-c[0])/c[2]-1;n[1]=2*(b[1]-c[1])/c[3]-1;n[2]=2*b[2]-1;n[3]=1;
@@ -41,7 +41,7 @@
 b[7];b=b[8];var j=e[0],k=e[1],l=e[2],p=e[3],m=e[4],t=e[5],n=e[6],w=e[7];e=e[8];a[0]=j*c+k*f+l*v;a[1]=j*q+k*g+l*h;a[2]=j*d+k*H+l*b;a[3]=p*c+m*f+t*v;a[4]=p*q+m*g+t*h;a[5]=p*d+m*H+t*b;a[6]=n*c+w*f+e*v;a[7]=n*q+w*g+e*h;a[8]=n*d+w*H+e*b;return a},multiplyVec2:function(b,e,a){a||(a=e);var c=e[0];e=e[1];a[0]=c*b[0]+e*b[3]+b[6];a[1]=c*b[1]+e*b[4]+b[7];return a},multiplyVec3:function(b,e,a){a||(a=e);var c=e[0],q=e[1];e=e[2];a[0]=c*b[0]+q*b[3]+e*b[6];a[1]=c*b[1]+q*b[4]+e*b[7];a[2]=c*b[2]+q*b[5]+e*b[8];return a},
 set:function(b,e){e[0]=b[0];e[1]=b[1];e[2]=b[2];e[3]=b[3];e[4]=b[4];e[5]=b[5];e[6]=b[6];e[7]=b[7];e[8]=b[8];return e},equal:function(b,e){return b===e||1E-6>Math.abs(b[0]-e[0])&&1E-6>Math.abs(b[1]-e[1])&&1E-6>Math.abs(b[2]-e[2])&&1E-6>Math.abs(b[3]-e[3])&&1E-6>Math.abs(b[4]-e[4])&&1E-6>Math.abs(b[5]-e[5])&&1E-6>Math.abs(b[6]-e[6])&&1E-6>Math.abs(b[7]-e[7])&&1E-6>Math.abs(b[8]-e[8])},identity:function(b){b||(b=y.create());b[0]=1;b[1]=0;b[2]=0;b[3]=0;b[4]=1;b[5]=0;b[6]=0;b[7]=0;b[8]=1;return b},transpose:function(b,
 e){if(!e||b===e){var a=b[1],c=b[2],q=b[5];b[1]=b[3];b[2]=b[6];b[3]=a;b[5]=b[7];b[6]=c;b[7]=q;return b}e[0]=b[0];e[1]=b[3];e[2]=b[6];e[3]=b[1];e[4]=b[4];e[5]=b[7];e[6]=b[2];e[7]=b[5];e[8]=b[8];return e},toMat4:function(b,e){e||(e=s.create());e[15]=1;e[14]=0;e[13]=0;e[12]=0;e[11]=0;e[10]=b[8];e[9]=b[7];e[8]=b[6];e[7]=0;e[6]=b[5];e[5]=b[4];e[4]=b[3];e[3]=0;e[2]=b[2];e[1]=b[1];e[0]=b[0];return e},str:function(b){return"["+b[0]+", "+b[1]+", "+b[2]+", "+b[3]+", "+b[4]+", "+b[5]+", "+b[6]+", "+b[7]+", "+
-b[8]+"]"}},s={create:function(b){var e=new j(16);b&&(e[0]=b[0],e[1]=b[1],e[2]=b[2],e[3]=b[3],e[4]=b[4],e[5]=b[5],e[6]=b[6],e[7]=b[7],e[8]=b[8],e[9]=b[9],e[10]=b[10],e[11]=b[11],e[12]=b[12],e[13]=b[13],e[14]=b[14],e[15]=b[15]);return e},createFrom:function(b,e,a,c,q,d,f,g,h,v,O,I,k,l,p,m){var t=new j(16);t[0]=b;t[1]=e;t[2]=a;t[3]=c;t[4]=q;t[5]=d;t[6]=f;t[7]=g;t[8]=h;t[9]=v;t[10]=O;t[11]=I;t[12]=k;t[13]=l;t[14]=p;t[15]=m;return t},set:function(b,e){e[0]=b[0];e[1]=b[1];e[2]=b[2];e[3]=b[3];e[4]=b[4];
+b[8]+"]"}},s={create:function(b){var e=new j(16);b&&(e[0]=b[0],e[1]=b[1],e[2]=b[2],e[3]=b[3],e[4]=b[4],e[5]=b[5],e[6]=b[6],e[7]=b[7],e[8]=b[8],e[9]=b[9],e[10]=b[10],e[11]=b[11],e[12]=b[12],e[13]=b[13],e[14]=b[14],e[15]=b[15]);return e},createFrom:function(b,e,a,c,q,d,f,g,h,v,N,I,k,l,p,m){var t=new j(16);t[0]=b;t[1]=e;t[2]=a;t[3]=c;t[4]=q;t[5]=d;t[6]=f;t[7]=g;t[8]=h;t[9]=v;t[10]=N;t[11]=I;t[12]=k;t[13]=l;t[14]=p;t[15]=m;return t},set:function(b,e){e[0]=b[0];e[1]=b[1];e[2]=b[2];e[3]=b[3];e[4]=b[4];
 e[5]=b[5];e[6]=b[6];e[7]=b[7];e[8]=b[8];e[9]=b[9];e[10]=b[10];e[11]=b[11];e[12]=b[12];e[13]=b[13];e[14]=b[14];e[15]=b[15];return e},equal:function(b,e){return b===e||1E-6>Math.abs(b[0]-e[0])&&1E-6>Math.abs(b[1]-e[1])&&1E-6>Math.abs(b[2]-e[2])&&1E-6>Math.abs(b[3]-e[3])&&1E-6>Math.abs(b[4]-e[4])&&1E-6>Math.abs(b[5]-e[5])&&1E-6>Math.abs(b[6]-e[6])&&1E-6>Math.abs(b[7]-e[7])&&1E-6>Math.abs(b[8]-e[8])&&1E-6>Math.abs(b[9]-e[9])&&1E-6>Math.abs(b[10]-e[10])&&1E-6>Math.abs(b[11]-e[11])&&1E-6>Math.abs(b[12]-
 e[12])&&1E-6>Math.abs(b[13]-e[13])&&1E-6>Math.abs(b[14]-e[14])&&1E-6>Math.abs(b[15]-e[15])},identity:function(b){b||(b=s.create());b[0]=1;b[1]=0;b[2]=0;b[3]=0;b[4]=0;b[5]=1;b[6]=0;b[7]=0;b[8]=0;b[9]=0;b[10]=1;b[11]=0;b[12]=0;b[13]=0;b[14]=0;b[15]=1;return b},transpose:function(b,e){if(!e||b===e){var a=b[1],c=b[2],q=b[3],d=b[6],f=b[7],g=b[11];b[1]=b[4];b[2]=b[8];b[3]=b[12];b[4]=a;b[6]=b[9];b[7]=b[13];b[8]=c;b[9]=d;b[11]=b[14];b[12]=q;b[13]=f;b[14]=g;return b}e[0]=b[0];e[1]=b[4];e[2]=b[8];e[3]=b[12];
 e[4]=b[1];e[5]=b[5];e[6]=b[9];e[7]=b[13];e[8]=b[2];e[9]=b[6];e[10]=b[10];e[11]=b[14];e[12]=b[3];e[13]=b[7];e[14]=b[11];e[15]=b[15];return e},determinant:function(b){var e=b[0],a=b[1],c=b[2],q=b[3],d=b[4],f=b[5],g=b[6],h=b[7],v=b[8],j=b[9],I=b[10],k=b[11],l=b[12],p=b[13],m=b[14];b=b[15];return l*j*g*q-v*p*g*q-l*f*I*q+d*p*I*q+v*f*m*q-d*j*m*q-l*j*c*h+v*p*c*h+l*a*I*h-e*p*I*h-v*a*m*h+e*j*m*h+l*f*c*k-d*p*c*k-l*a*g*k+e*p*g*k+d*a*m*k-e*f*m*k-v*f*c*b+d*j*c*b+v*a*g*b-e*j*g*b-d*a*I*b+e*f*I*b},inverse:function(b,
@@ -131,12 +131,14 @@
 PIXI.BaseTexture=function(a){PIXI.EventTarget.call(this);this.height=this.width=100;this.source=a;if(this.source instanceof Image)if(this.source.complete)this.hasLoaded=!0,this.width=this.source.width,this.height=this.source.height,PIXI.texturesToUpdate.push(this);else{var c=this;this.source.onload=function(){c.hasLoaded=!0;c.width=c.source.width;c.height=c.source.height;PIXI.texturesToUpdate.push(c);c.dispatchEvent({type:"loaded",content:c})}}else this.hasLoaded=!0,this.width=this.source.width,this.height=
 this.source.height,PIXI.texturesToUpdate.push(this)};PIXI.BaseTexture.constructor=PIXI.BaseTexture;PIXI.BaseTexture.prototype.fromImage=function(){};PIXI.TextureCache={};PIXI.FrameCache={};
 PIXI.Texture=function(a,c){PIXI.EventTarget.call(this);c||(this.noFrame=!0,c=new PIXI.Rectangle(0,0,1,1));this.trim=new PIXI.Point;this.baseTexture=a;this.frame=c;this.scope=this;if(a.hasLoaded)this.noFrame&&(c=new PIXI.Rectangle(0,0,a.width,a.height)),this.setFrame(c);else{var d=this;a.addEventListener("loaded",function(){d.onBaseTextureLoaded()})}};PIXI.Texture.constructor=PIXI.Texture;
-PIXI.Texture.prototype.onBaseTextureLoaded=function(){var a=this.baseTexture;a.removeEventListener("loaded",this.onLoaded);this.noFrame&&(this.frame=new PIXI.Rectangle(0,0,a.width,a.height));this.noFrame=!1;this.width=this.frame.width;this.height=this.frame.height;this.scope.dispatchEvent({type:"update",content:this})};PIXI.Texture.prototype.setFrame=function(a){this.frame=a;this.width=a.width;this.height=a.height};
+PIXI.Texture.prototype.onBaseTextureLoaded=function(){var a=this.baseTexture;a.removeEventListener("loaded",this.onLoaded);this.noFrame&&(this.frame=new PIXI.Rectangle(0,0,a.width,a.height));this.noFrame=!1;this.width=this.frame.width;this.height=this.frame.height;this.scope.dispatchEvent({type:"update",content:this})};
+PIXI.Texture.prototype.setFrame=function(a){this.frame=a;this.width=a.width;this.height=a.height;if(a.x+a.width>this.baseTexture.width||a.y+a.height>this.baseTexture.height)throw Error("Texture Error: frame does not fit inside the base Texture dimensions "+this);};
 PIXI.Texture.fromImage=function(a,c){var d=PIXI.TextureCache[a];d||(d=PIXI.BaseTextureCache[a],d||(d=new Image,c&&(d.crossOrigin=""),d.src=a,d=new PIXI.BaseTexture(d),PIXI.BaseTextureCache[a]=d),d=new PIXI.Texture(d),PIXI.TextureCache[a]=d);return d};PIXI.Texture.fromFrame=function(a){var c=PIXI.TextureCache[a];if(!c)throw Error("The frameId '"+a+"' does not exist in the texture cache "+this);return c};
 PIXI.Texture.fromCanvas=function(a){var c=PIXI.TextureCache[a];c||(c=PIXI.BaseTextureCache[a],c||(c=new PIXI.BaseTexture(a),PIXI.BaseTextureCache[a]=c),c=new PIXI.Texture(c),PIXI.TextureCache[a]=c);return c};PIXI.Texture.addTextureToCache=function(a,c){PIXI.TextureCache[c]=a};PIXI.Texture.removeTextureFromCache=function(a){var c=PIXI.TextureCache[a];PIXI.TextureCache[a]=null;return c};
 PIXI.SpriteSheetLoader=function(a){PIXI.EventTarget.call(this);this.url=a;this.baseUrl=a.replace(/[^\/]*$/,"");this.texture;this.frames={};this.crossorigin=!1};PIXI.SpriteSheetLoader.constructor=PIXI.SpriteSheetLoader;
 PIXI.SpriteSheetLoader.prototype.load=function(){this.ajaxRequest=new AjaxRequest;var a=this;this.ajaxRequest.onreadystatechange=function(){a.onLoaded()};this.ajaxRequest.open("GET",this.url,!0);this.ajaxRequest.overrideMimeType&&this.ajaxRequest.overrideMimeType("application/json");this.ajaxRequest.send(null)};
 PIXI.SpriteSheetLoader.prototype.onLoaded=function(){if(4==this.ajaxRequest.readyState&&(200==this.ajaxRequest.status||-1==window.location.href.indexOf("http"))){var a=eval("("+this.ajaxRequest.responseText+")");this.texture=PIXI.Texture.fromImage(this.baseUrl+a.meta.image,this.crossorigin).baseTexture;var a=a.frames,c;for(c in a){var d=a[c].frame;PIXI.TextureCache[c]=new PIXI.Texture(this.texture,{x:d.x,y:d.y,width:d.w,height:d.h});a[c].trimmed&&(PIXI.TextureCache[c].realSize=a[c].spriteSourceSize,
 PIXI.TextureCache[c].trim.x=0)}if(this.texture.hasLoaded)this.dispatchEvent({type:"loaded",content:this});else{var f=this;this.texture.addEventListener("loaded",function(){f.dispatchEvent({type:"loaded",content:f})})}}};PIXI.AssetLoader=function(a){PIXI.EventTarget.call(this);this.assetURLs=a;this.assets=[];this.crossorigin=!1};PIXI.AssetLoader.constructor=PIXI.AssetLoader;
-PIXI.AssetLoader.prototype.load=function(){this.loadCount=this.assetURLs.length;for(var a=["jpeg","jpg","png","gif"],c=["json"],d=0;d<this.assetURLs.length;d++){for(var f=this.assetURLs[d],g=f.split(".").pop().toLowerCase(),h=null,j=0;j<a.length;j++)if(g==a[j]){h="img";break}if("img"!=h)for(j=0;j<c.length;j++)if(g==c[j]){h="atlas";break}if("img"==h)if(f=PIXI.Texture.fromImage(f,this.crossorigin),f.hasLoaded)this.loadCount--;else{var k=this;f.baseTexture.addEventListener("loaded",function(){k.onAssetLoaded()});
-this.assets.push(f)}else if("atlas"==h)f=new PIXI.SpriteSheetLoader(f),f.crossorigin=this.crossorigin,this.assets.push(f),k=this,f.addEventListener("loaded",function(){k.onAssetLoaded()}),f.load();else throw Error(f+" is an unsupported file type "+this);}};PIXI.AssetLoader.prototype.onAssetLoaded=function(){this.loadCount--;this.dispatchEvent({type:"onProgress",content:this});if(this.onProgress)this.onProgress();if(0==this.loadCount&&(this.dispatchEvent({type:"onComplete",content:this}),this.onComplete))this.onComplete()};
\ No newline at end of file
+PIXI.AssetLoader.prototype.load=function(){this.loadCount=this.assetURLs.length;for(var a=["jpeg","jpg","png","gif"],c=["json"],d=0;d<this.assetURLs.length;d++){for(var f=this.assetURLs[d],g=f.split(".").pop().toLowerCase(),h=null,j=0;j<a.length;j++)if(g==a[j]){h="img";break}if("img"!=h)for(j=0;j<c.length;j++)if(g==c[j]){h="atlas";break}if("img"==h)if(f=PIXI.Texture.fromImage(f,this.crossorigin),f.baseTexture.hasLoaded){if(this.loadCount--,0==this.loadCount&&(this.dispatchEvent({type:"onComplete",
+content:this}),this.onComplete))this.onComplete()}else{var k=this;f.baseTexture.addEventListener("loaded",function(){k.onAssetLoaded()});this.assets.push(f)}else if("atlas"==h)f=new PIXI.SpriteSheetLoader(f),f.crossorigin=this.crossorigin,this.assets.push(f),k=this,f.addEventListener("loaded",function(){k.onAssetLoaded()}),f.load();else throw Error(f+" is an unsupported file type "+this);}};
+PIXI.AssetLoader.prototype.onAssetLoaded=function(){this.loadCount--;this.dispatchEvent({type:"onProgress",content:this});if(this.onProgress)this.onProgress();if(0==this.loadCount&&(this.dispatchEvent({type:"onComplete",content:this}),this.onComplete))this.onComplete()};
\ No newline at end of file
diff --git a/src/pixi/loaders/AssetLoader.js b/src/pixi/loaders/AssetLoader.js
index 5e3fbf3..7484590 100644
--- a/src/pixi/loaders/AssetLoader.js
+++ b/src/pixi/loaders/AssetLoader.js
@@ -82,7 +82,7 @@
 		{
 			
 			var texture = PIXI.Texture.fromImage(filename, this.crossorigin);
-			if(!texture.hasLoaded)
+			if(!texture.baseTexture.hasLoaded)
 			{
 				
 				var scope = this;
@@ -98,6 +98,12 @@
 				
 				// already loaded!
 				this.loadCount--;
+				// if this hits zero here.. then everything was cached!
+				if(this.loadCount == 0)
+				{
+					this.dispatchEvent( { type: 'onComplete', content: this } );
+					if(this.onComplete)this.onComplete();
+				}
 			}
 			
 		}
diff --git a/src/pixi/textures/Texture.js b/src/pixi/textures/Texture.js
index ddea852..2cca2b3 100644
--- a/src/pixi/textures/Texture.js
+++ b/src/pixi/textures/Texture.js
@@ -82,6 +82,11 @@
 	this.frame = frame;
 	this.width = frame.width;
 	this.height = frame.height;
+	
+	if(frame.x + frame.width > this.baseTexture.width || frame.y + frame.height > this.baseTexture.height)
+	{
+		throw new Error("Texture Error: frame does not fit inside the base Texture dimensions " + this);
+	}
 	//this.updateFrame = true;
 }
 
@@ -109,7 +114,6 @@
 				image.crossOrigin = '';
 			}
 			image.src = imageUrl;
-			
 			baseTexture = new PIXI.BaseTexture(image);
 			PIXI.BaseTextureCache[imageUrl] = baseTexture;
 		}