diff --git a/spine-as3/spine-as3/src/spine/IkConstraint.as b/spine-as3/spine-as3/src/spine/IkConstraint.as
index 4955545d5..1e472df8d 100644
--- a/spine-as3/spine-as3/src/spine/IkConstraint.as
+++ b/spine-as3/spine-as3/src/spine/IkConstraint.as
@@ -144,7 +144,7 @@ public class IkConstraint implements Updatable {
 		if (u) {
 			l2 *= psx;
 			var cos:Number = (tx * tx + ty * ty - l1 * l1 - l2 * l2) / (2 * l1 * l2);
-			if (cos < -1) 
+			if (cos < -1)
 				cos = -1;
 			else if (cos > 1) cos = 1;
 			a2 = Math.acos(cos) * bendDir;
diff --git a/spine-as3/spine-as3/src/spine/PathConstraint.as b/spine-as3/spine-as3/src/spine/PathConstraint.as
index 3fea8f3b0..8bfc165a4 100644
--- a/spine-as3/spine-as3/src/spine/PathConstraint.as
+++ b/spine-as3/spine-as3/src/spine/PathConstraint.as
@@ -173,7 +173,7 @@ public class PathConstraint implements Updatable {
 			}
 			this._world.length = 8;
 			world = this._world;
-			var o:int, curve:int; 
+			var o:int, curve:int;
 			for (i = 0, o = 0, curve = 0; i < spacesCount; i++, o += 3) {
 				var space:Number = spaces[i];
 				position += space;
diff --git a/spine-as3/spine-as3/src/spine/Skeleton.as b/spine-as3/spine-as3/src/spine/Skeleton.as
index 25a029c3e..c4b23573c 100644
--- a/spine-as3/spine-as3/src/spine/Skeleton.as
+++ b/spine-as3/spine-as3/src/spine/Skeleton.as
@@ -277,7 +277,7 @@ public class Skeleton {
 
 	public function setSlotsToSetupPose () : void {
 		var i:int = 0;
-		for each (var slot:Slot in slots) { 
+		for each (var slot:Slot in slots) {
 			drawOrder[i++] = slot;
 			slot.setToSetupPose();
 		}
@@ -353,8 +353,8 @@ public class Skeleton {
 		return _skin == null ? null : _skin._name;
 	}
 
-	/** Sets the skin used to look up attachments before looking in the {@link SkeletonData#getDefaultSkin() default skin}. 
-	 * Attachments from the new skin are attached if the corresponding attachment from the old skin was attached. If there was 
+	/** Sets the skin used to look up attachments before looking in the {@link SkeletonData#getDefaultSkin() default skin}.
+	 * Attachments from the new skin are attached if the corresponding attachment from the old skin was attached. If there was
 	 * no old skin, each slot's setup mode attachment is attached from the new skin.
 	 * @param newSkin May be null. */
 	public function set skin (newSkin:Skin) : void {
diff --git a/spine-as3/spine-as3/src/spine/SkeletonJson.as b/spine-as3/spine-as3/src/spine/SkeletonJson.as
index 6f0a2ba43..34951584c 100644
--- a/spine-as3/spine-as3/src/spine/SkeletonJson.as
+++ b/spine-as3/spine-as3/src/spine/SkeletonJson.as
@@ -366,14 +366,14 @@ public class SkeletonJson {
 		var bones:Vector.<int> = new Vector.<int>(verticesLength * 3);
 		bones.length = 0;
 		for (i = 0, n = vertices.length; i < n;) {
-			 var boneCount:int = int(vertices[i++]);
-			 bones.push(boneCount);
-			 for (var nn:int = i + boneCount * 4; i < nn; i+=4) {
+			var boneCount:int = int(vertices[i++]);
+			bones.push(boneCount);
+			for (var nn:int = i + boneCount * 4; i < nn; i+=4) {
 				bones.push(int(vertices[i]));
 				weights.push(vertices[i + 1] * scale);
 				weights.push(vertices[i + 2] * scale);
 				weights.push(vertices[i + 3]);
-			 }
+			}
 		}
 		attachment.bones = bones;
 		attachment.vertices = weights;
diff --git a/spine-as3/spine-as3/src/spine/animation/Animation.as b/spine-as3/spine-as3/src/spine/animation/Animation.as
index f8d70b269..297ece419 100644
--- a/spine-as3/spine-as3/src/spine/animation/Animation.as
+++ b/spine-as3/spine-as3/src/spine/animation/Animation.as
@@ -121,7 +121,7 @@ public class Animation {
 		}
 		return 0; // Can't happen.
 	}
-	
+
 	static public function linearSearch (values:Vector.<Number>, target:Number, step:int) : int {
 		for (var i:int = 0, last:int = values.length - step; i <= last; i += step)
 			if (values[i] > target)
diff --git a/spine-as3/spine-as3/src/spine/animation/AnimationState.as b/spine-as3/spine-as3/src/spine/animation/AnimationState.as
index 086f9faa6..f174b5eee 100644
--- a/spine-as3/spine-as3/src/spine/animation/AnimationState.as
+++ b/spine-as3/spine-as3/src/spine/animation/AnimationState.as
@@ -53,7 +53,7 @@ public class AnimationState {
 		for (var i:int = 0; i < _tracks.length; i++) {
 			var current:TrackEntry = _tracks[i];
 			if (!current) continue;
-			
+
 			current.time += delta * current.timeScale;
 			if (current.previous) {
 				var previousDelta:Number = delta * current.previous.timeScale;
@@ -76,15 +76,15 @@ public class AnimationState {
 		for (var i:int = 0; i < _tracks.length; i++) {
 			var current:TrackEntry = _tracks[i];
 			if (!current) continue;
-			
+
 			_events.length = 0;
-			
+
 			var time:Number = current.time;
 			var lastTime:Number = current.lastTime;
 			var endTime:Number = current.endTime;
 			var loop:Boolean = current.loop;
 			if (!loop && time > endTime) time = endTime;
-			
+
 			var previous:TrackEntry = current.previous;
 			if (!previous) {
 				if (current.mix == 1)
@@ -95,7 +95,7 @@ public class AnimationState {
 				var previousTime:Number = previous.time;
 				if (!previous.loop && previousTime > previous.endTime) previousTime = previous.endTime;
 				previous.animation.apply(skeleton, previousTime, previousTime, previous.loop, null);
-				
+
 				var alpha:Number = current.mixTime / current.mixDuration * current.mix;
 				if (alpha >= 1) {
 					alpha = 1;
@@ -103,7 +103,7 @@ public class AnimationState {
 				}
 				current.animation.mix(skeleton, current.lastTime, time, loop, _events, alpha);
 			}
-			
+
 			for each (var event:Event in _events) {
 				if (current.onEvent != null) current.onEvent(i, event);
 				onEvent.invoke(i, event);
@@ -123,9 +123,9 @@ public class AnimationState {
 	public function clearTracks () : void {
 		for (var i:int = 0, n:int = _tracks.length; i < n; i++)
 			clearTrack(i);
-		_tracks.length = 0; 
+		_tracks.length = 0;
 	}
-	
+
 	public function clearTrack (trackIndex:int) : void {
 		if (trackIndex >= _tracks.length) return;
 		var current:TrackEntry = _tracks[trackIndex];
@@ -136,14 +136,14 @@ public class AnimationState {
 
 		_tracks[trackIndex] = null;
 	}
-	
+
 	private function expandToIndex (index:int) : TrackEntry {
 		if (index < _tracks.length) return _tracks[index];
 		while (index >= _tracks.length)
 			_tracks[_tracks.length] = null;
 		return null;
 	}
-	
+
 	private function setCurrent (index:int, entry:TrackEntry) : void {
 		var current:TrackEntry = expandToIndex(index);
 		if (current) {
@@ -164,19 +164,19 @@ public class AnimationState {
 					entry.previous = current;
 			}
 		}
-		
+
 		_tracks[index] = entry;
 
 		if (entry.onStart != null) entry.onStart(index);
 		onStart.invoke(index);
 	}
-	
+
 	public function setAnimationByName (trackIndex:int, animationName:String, loop:Boolean) : TrackEntry {
 		var animation:Animation = _data._skeletonData.findAnimation(animationName);
 		if (!animation) throw new ArgumentError("Animation not found: " + animationName);
 		return setAnimation(trackIndex, animation, loop);
 	}
-	
+
 	/** Set the current animation. Any queued animations are cleared. */
 	public function setAnimation (trackIndex:int, animation:Animation, loop:Boolean) : TrackEntry {
 		var entry:TrackEntry = new TrackEntry();
@@ -186,13 +186,13 @@ public class AnimationState {
 		setCurrent(trackIndex, entry);
 		return entry;
 	}
-	
+
 	public function addAnimationByName (trackIndex:int, animationName:String, loop:Boolean, delay:Number) : TrackEntry {
 		var animation:Animation = _data._skeletonData.findAnimation(animationName);
 		if (!animation) throw new ArgumentError("Animation not found: " + animationName);
 		return addAnimation(trackIndex, animation, loop, delay);
 	}
-	
+
 	/** Adds an animation to be played delay seconds after the current or last queued animation.
 	 * @param delay May be <= 0 to use duration of previous animation minus any mix duration plus the negative delay. */
 	public function addAnimation (trackIndex:int, animation:Animation, loop:Boolean, delay:Number) : TrackEntry {
@@ -200,7 +200,7 @@ public class AnimationState {
 		entry.animation = animation;
 		entry.loop = loop;
 		entry.endTime = animation.duration;
-		
+
 		var last:TrackEntry = expandToIndex(trackIndex);
 		if (last) {
 			while (last.next)
@@ -208,7 +208,7 @@ public class AnimationState {
 			last.next = entry;
 		} else
 			_tracks[trackIndex] = entry;
-		
+
 		if (delay <= 0) {
 			if (last)
 				delay += last.endTime - _data.getMix(last.animation, animation);
@@ -216,10 +216,10 @@ public class AnimationState {
 				delay = 0;
 		}
 		entry.delay = delay;
-		
+
 		return entry;
 	}
-	
+
 	/** May be null. */
 	public function getCurrent (trackIndex:int) : TrackEntry {
 		if (trackIndex >= _tracks.length) return null;
diff --git a/spine-as3/spine-as3/src/spine/animation/CurveTimeline.as b/spine-as3/spine-as3/src/spine/animation/CurveTimeline.as
index 2aa10ebbd..b58c54690 100644
--- a/spine-as3/spine-as3/src/spine/animation/CurveTimeline.as
+++ b/spine-as3/spine-as3/src/spine/animation/CurveTimeline.as
@@ -37,7 +37,7 @@ import spine.Skeleton;
 public class CurveTimeline implements Timeline {
 	static private const LINEAR:Number = 0;
 	static private const STEPPED:Number = 1;
-	static private const BEZIER:Number = 2;	
+	static private const BEZIER:Number = 2;
 	static private const BEZIER_SIZE:int = 10 * 2 - 1;
 
 	private var curves:Vector.<Number>; // type, x, y, ...
diff --git a/spine-as3/spine-as3/src/spine/animation/DeformTimeline.as b/spine-as3/spine-as3/src/spine/animation/DeformTimeline.as
index 336af315d..328fe1f5c 100644
--- a/spine-as3/spine-as3/src/spine/animation/DeformTimeline.as
+++ b/spine-as3/spine-as3/src/spine/animation/DeformTimeline.as
@@ -84,8 +84,8 @@ public class DeformTimeline extends CurveTimeline {
 		var frame:int = Animation.binarySearch1(frames, time);
 		var prevVertices:Vector.<Number> = frameVertices[int(frame - 1)];
 		var nextVertices:Vector.<Number> = frameVertices[frame];
-		var frameTime:Number = frames[frame];		
-		var percent:Number = getCurvePercent(frame - 1, 1 - (time - frameTime) / (frames[frame - 1] - frameTime));		
+		var frameTime:Number = frames[frame];
+		var percent:Number = getCurvePercent(frame - 1, 1 - (time - frameTime) / (frames[frame - 1] - frameTime));
 
 		var prev:Number;
 		if (alpha < 1) {
diff --git a/spine-as3/spine-as3/src/spine/animation/DrawOrderTimeline.as b/spine-as3/spine-as3/src/spine/animation/DrawOrderTimeline.as
index 29928c2bc..68975ca38 100644
--- a/spine-as3/spine-as3/src/spine/animation/DrawOrderTimeline.as
+++ b/spine-as3/spine-as3/src/spine/animation/DrawOrderTimeline.as
@@ -70,7 +70,7 @@ public class DrawOrderTimeline implements Timeline {
 			for each (var slot:Slot in slots)
 				drawOrder[i++] = slot;
 		} else {
-			for each (var setupIndex:int in drawOrderToSetupIndex) 
+			for each (var setupIndex:int in drawOrderToSetupIndex)
 				drawOrder[i++] = slots[setupIndex];
 		}
 	}
diff --git a/spine-as3/spine-as3/src/spine/animation/EventTimeline.as b/spine-as3/spine-as3/src/spine/animation/EventTimeline.as
index 61a6a303f..be3269b2c 100644
--- a/spine-as3/spine-as3/src/spine/animation/EventTimeline.as
+++ b/spine-as3/spine-as3/src/spine/animation/EventTimeline.as
@@ -54,14 +54,14 @@ public class EventTimeline implements Timeline {
 	/** Fires events for frames > lastTime and <= time. */
 	public function apply (skeleton:Skeleton, lastTime:Number, time:Number, firedEvents:Vector.<Event>, alpha:Number) : void {
 		if (!firedEvents) return;
-		
+
 		if (lastTime > time) { // Fire events after last time for looped animations.
 			apply(skeleton, lastTime, int.MAX_VALUE, firedEvents, alpha);
 			lastTime = -1;
 		} else if (lastTime >= frames[int(frameCount - 1)]) // Last time is after last frame.
 			return;
 		if (time < frames[0]) return; // Time is before first frame.
-		
+
 		var frame:int;
 		if (lastTime < frames[0])
 			frame = 0;
diff --git a/spine-as3/spine-as3/src/spine/animation/Listeners.as b/spine-as3/spine-as3/src/spine/animation/Listeners.as
index 0aa32d4a8..571dc3a9f 100644
--- a/spine-as3/spine-as3/src/spine/animation/Listeners.as
+++ b/spine-as3/spine-as3/src/spine/animation/Listeners.as
@@ -31,14 +31,14 @@
 package spine.animation {
 	public class Listeners {
 		private var _listeners:Vector.<Function> = new Vector.<Function>();
-		
-		public function Listeners () {			
+
+		public function Listeners () {
 		}
-		
+
 		public function get listeners () : Vector.<Function> {
 			return _listeners;
 		}
-		
+
 		public function add (listener:Function) : void {
 			if (listener == null)
 				throw new ArgumentError("listener cannot be null.");
diff --git a/spine-as3/spine-as3/src/spine/animation/PathConstraintMixTimeline.as b/spine-as3/spine-as3/src/spine/animation/PathConstraintMixTimeline.as
index 11d594f69..cca88e4ea 100644
--- a/spine-as3/spine-as3/src/spine/animation/PathConstraintMixTimeline.as
+++ b/spine-as3/spine-as3/src/spine/animation/PathConstraintMixTimeline.as
@@ -39,13 +39,13 @@ public class PathConstraintMixTimeline extends CurveTimeline {
 	static internal const ROTATE:int = 1, TRANSLATE:int = 2;
 
 	public var pathConstraintIndex:int;
-	
+
 	public var frames:Vector.<Number>; // time, rotate mix, translate mix, ...
 
 	public function PathConstraintMixTimeline (frameCount:int) {
 		super(frameCount);
 		frames = new Vector.<Number>(frameCount * ENTRIES, true);
-	}	
+	}
 
 	/** Sets the time and mixes of the specified keyframe. */
 	public function setFrame (frameIndex:int, time:Number, rotateMix:Number, translateMix:Number) : void {
@@ -55,7 +55,7 @@ public class PathConstraintMixTimeline extends CurveTimeline {
 		frames[frameIndex + TRANSLATE] = translateMix;
 	}
 
-	override public function apply (skeleton:Skeleton, lastTime:Number, time:Number, firedEvents:Vector.<Event>, alpha:Number) : void {		
+	override public function apply (skeleton:Skeleton, lastTime:Number, time:Number, firedEvents:Vector.<Event>, alpha:Number) : void {
 		if (time < frames[0]) return; // Time is before first frame.
 
 		var constraint:PathConstraint = skeleton.pathConstraints[pathConstraintIndex];
diff --git a/spine-as3/spine-as3/src/spine/animation/PathConstraintPositionTimeline.as b/spine-as3/spine-as3/src/spine/animation/PathConstraintPositionTimeline.as
index 7bbbe6a04..821f1b704 100644
--- a/spine-as3/spine-as3/src/spine/animation/PathConstraintPositionTimeline.as
+++ b/spine-as3/spine-as3/src/spine/animation/PathConstraintPositionTimeline.as
@@ -32,7 +32,7 @@ package spine.animation {
 import spine.PathConstraint;
 import spine.Event;
 import spine.Skeleton;
-	
+
 public class PathConstraintPositionTimeline extends CurveTimeline {
 	static public const ENTRIES:int = 2;
 	static internal const PREV_TIME:int = -2, PREV_VALUE:int = -1;
@@ -54,7 +54,7 @@ public class PathConstraintPositionTimeline extends CurveTimeline {
 		frames[frameIndex + VALUE] = value;
 	}
 
-	override public function apply (skeleton:Skeleton, lastTime:Number, time:Number, firedEvents:Vector.<Event>, alpha:Number) : void {		
+	override public function apply (skeleton:Skeleton, lastTime:Number, time:Number, firedEvents:Vector.<Event>, alpha:Number) : void {
 		if (time < frames[0]) return; // Time is before first frame.
 
 		var constraint:PathConstraint = skeleton.pathConstraints[pathConstraintIndex];
diff --git a/spine-as3/spine-as3/src/spine/animation/PathConstraintSpacingTimeline.as b/spine-as3/spine-as3/src/spine/animation/PathConstraintSpacingTimeline.as
index aa5af6a5c..3f6e75cbd 100644
--- a/spine-as3/spine-as3/src/spine/animation/PathConstraintSpacingTimeline.as
+++ b/spine-as3/spine-as3/src/spine/animation/PathConstraintSpacingTimeline.as
@@ -38,7 +38,7 @@ public class PathConstraintSpacingTimeline extends PathConstraintPositionTimelin
 		super(frameCount);
 	}
 
-	override public function apply (skeleton:Skeleton, lastTime:Number, time:Number, firedEvents:Vector.<Event>, alpha:Number) : void {		
+	override public function apply (skeleton:Skeleton, lastTime:Number, time:Number, firedEvents:Vector.<Event>, alpha:Number) : void {
 		if (time < frames[0]) return; // Time is before first frame.
 
 		var constraint:PathConstraint = skeleton.pathConstraints[pathConstraintIndex];
diff --git a/spine-as3/spine-as3/src/spine/animation/RotateTimeline.as b/spine-as3/spine-as3/src/spine/animation/RotateTimeline.as
index 4b584035a..140bb1af9 100644
--- a/spine-as3/spine-as3/src/spine/animation/RotateTimeline.as
+++ b/spine-as3/spine-as3/src/spine/animation/RotateTimeline.as
@@ -58,7 +58,7 @@ public class RotateTimeline extends CurveTimeline {
 			return; // Time is before first frame.
 
 		var bone:Bone = skeleton.bones[boneIndex];
-		
+
 		if (time >= frames[int(frames.length - 2)]) { // Time is after last frame.
 			var amount:Number = bone.data.rotation + frames[int(frames.length + PREV_ROTATION)] - bone.rotation;
 			while (amount > 180)
@@ -72,7 +72,7 @@ public class RotateTimeline extends CurveTimeline {
 		// Interpolate between the previous frame and the current frame.
 		var frame:int = Animation.binarySearch(frames, time, ENTRIES);
 		var prevRotation:Number = frames[int(frame + PREV_ROTATION)];
-		var frameTime:Number = frames[frame];		
+		var frameTime:Number = frames[frame];
 		var percent:Number = getCurvePercent((frame >> 1) - 1, 1 - (time - frameTime) / (frames[frame + PREV_TIME] - frameTime));
 
 		amount = frames[int(frame + ROTATION)] - prevRotation;
diff --git a/spine-as3/spine-as3/src/spine/animation/TrackEntry.as b/spine-as3/spine-as3/src/spine/animation/TrackEntry.as
index 2ec83ef49..2d9cb6073 100644
--- a/spine-as3/spine-as3/src/spine/animation/TrackEntry.as
+++ b/spine-as3/spine-as3/src/spine/animation/TrackEntry.as
@@ -38,10 +38,10 @@ public class TrackEntry {
 	public var delay:Number, time:Number = 0, lastTime:Number = -1, endTime:Number, timeScale:Number = 1;
 	internal var mixTime:Number, mixDuration:Number, mix:Number = 1;
 	public var onStart:Function, onEnd:Function, onComplete:Function, onEvent:Function;
-	
-	public function TrackEntry () {		
+
+	public function TrackEntry () {
 	}
-	
+
 	public function toString () : String {
 		return animation == null ? "<none>" : animation.name;
 	}
diff --git a/spine-as3/spine-as3/src/spine/animation/TransformConstraintTimeline.as b/spine-as3/spine-as3/src/spine/animation/TransformConstraintTimeline.as
index 3f649c856..b7593e5ea 100644
--- a/spine-as3/spine-as3/src/spine/animation/TransformConstraintTimeline.as
+++ b/spine-as3/spine-as3/src/spine/animation/TransformConstraintTimeline.as
@@ -45,7 +45,7 @@ public class TransformConstraintTimeline extends CurveTimeline {
 		super(frameCount);
 		frames = new Vector.<Number>(frameCount * ENTRIES, true);
 	}
-	
+
 	/** Sets the time and mixes of the specified keyframe. */
 	public function setFrame (frameIndex:int, time:Number, rotateMix:Number, translateMix:Number, scaleMix:Number, shearMix:Number) : void {
 		frameIndex *= ENTRIES;
diff --git a/spine-as3/spine-as3/src/spine/flash/FlashTextureLoader.as b/spine-as3/spine-as3/src/spine/flash/FlashTextureLoader.as
index 6501a383d..a8b908890 100644
--- a/spine-as3/spine-as3/src/spine/flash/FlashTextureLoader.as
+++ b/spine-as3/spine-as3/src/spine/flash/FlashTextureLoader.as
@@ -40,7 +40,7 @@ public class FlashTextureLoader implements TextureLoader {
 	public var bitmapDatas:Object = {};
 	public var singleBitmapData:BitmapData;
 
-	/** @param bitmaps A Bitmap or BitmapData for an atlas that has only one page, or for a multi page atlas an object where the 
+	/** @param bitmaps A Bitmap or BitmapData for an atlas that has only one page, or for a multi page atlas an object where the
 	 * key is the image path and the value is the Bitmap or BitmapData. */
 	public function FlashTextureLoader (bitmaps:Object) {
 		if (bitmaps is BitmapData) {
diff --git a/spine-c/include/spine/Bone.h b/spine-c/include/spine/Bone.h
index 2af95b2be..eb3bd6adc 100644
--- a/spine-c/include/spine/Bone.h
+++ b/spine-c/include/spine/Bone.h
@@ -67,7 +67,7 @@ struct spBone {
 		a(0), b(0), worldX(0),
 		c(0), d(0), worldY(0),
 		worldSignX(0), worldSignY(0),
-		
+
 		sorted(0) {
 	}
 #endif
diff --git a/spine-c/include/spine/IkConstraint.h b/spine-c/include/spine/IkConstraint.h
index d6025ab3b..20a9db149 100644
--- a/spine-c/include/spine/IkConstraint.h
+++ b/spine-c/include/spine/IkConstraint.h
@@ -42,10 +42,10 @@ struct spSkeleton;
 
 typedef struct spIkConstraint {
 	spIkConstraintData* const data;
-	
+
 	int bonesCount;
 	spBone** bones;
-	
+
 	spBone* target;
 	int bendDirection;
 	float mix;
diff --git a/spine-c/include/spine/IkConstraintData.h b/spine-c/include/spine/IkConstraintData.h
index e6d639924..92813dd42 100644
--- a/spine-c/include/spine/IkConstraintData.h
+++ b/spine-c/include/spine/IkConstraintData.h
@@ -39,10 +39,10 @@ extern "C" {
 
 typedef struct spIkConstraintData {
 	const char* const name;
-	
+
 	int bonesCount;
 	spBoneData** bones;
-	
+
 	spBoneData* target;
 	int bendDirection;
 	float mix;
diff --git a/spine-c/src/spine/Animation.c b/spine-c/src/spine/Animation.c
index ebe7abe09..87576a7bc 100644
--- a/spine-c/src/spine/Animation.c
+++ b/spine-c/src/spine/Animation.c
@@ -463,7 +463,7 @@ void _spColorTimeline_apply (const spTimeline* timeline, spSkeleton* skeleton, f
 
 		frameTime = self->frames[frame];
 		percent = spCurveTimeline_getCurvePercent(SUPER(self), frame / COLOR_ENTRIES - 1,
-												  1 - (time - frameTime) / (self->frames[frame + COLOR_PREV_TIME] - frameTime));
+			1 - (time - frameTime) / (self->frames[frame + COLOR_PREV_TIME] - frameTime));
 
 		r += (self->frames[frame + COLOR_R] - r) * percent;
 		g += (self->frames[frame + COLOR_G] - g) * percent;
@@ -918,7 +918,7 @@ static const int PATHCONSTRAINTPOSITION_PREV_VALUE = -1;
 static const int PATHCONSTRAINTPOSITION_VALUE = 1;
 
 void _spPathConstraintPositionTimeline_apply(const spTimeline* timeline, spSkeleton* skeleton, float lastTime, float time,
-											 spEvent** firedEvents, int* eventsCount, float alpha) {
+		spEvent** firedEvents, int* eventsCount, float alpha) {
 	int frame;
 	float frameTime, percent, position;
 	spPathConstraint* constraint;
@@ -963,7 +963,7 @@ static const int PATHCONSTRAINTSPACING_PREV_VALUE = -1;
 static const int PATHCONSTRAINTSPACING_VALUE = 1;
 
 void _spPathConstraintSpacingTimeline_apply(const spTimeline* timeline, spSkeleton* skeleton, float lastTime, float time,
-											 spEvent** firedEvents, int* eventsCount, float alpha) {
+		spEvent** firedEvents, int* eventsCount, float alpha) {
 	int frame;
 	float frameTime, percent, spacing;
 	spPathConstraint* constraint;
diff --git a/spine-c/src/spine/Atlas.c b/spine-c/src/spine/Atlas.c
index 7da01e6d9..0937dabde 100644
--- a/spine-c/src/spine/Atlas.c
+++ b/spine-c/src/spine/Atlas.c
@@ -202,7 +202,7 @@ spAtlas* spAtlas_create (const char* begin, int length, const char* dir, void* r
 			switch (readTuple(&begin, end, tuple)) {
 			case 0:
 				return abortAtlas(self);
-			case 2:  /* size is only optional for an atlas packed with an old TexturePacker. */
+			case 2: /* size is only optional for an atlas packed with an old TexturePacker. */
 				page->width = toInt(tuple);
 				page->height = toInt(tuple + 1);
 				if (!readTuple(&begin, end, tuple)) return abortAtlas(self);
diff --git a/spine-c/src/spine/PathConstraint.c b/spine-c/src/spine/PathConstraint.c
index e2bb64634..709237ed2 100644
--- a/spine-c/src/spine/PathConstraint.c
+++ b/spine-c/src/spine/PathConstraint.c
@@ -126,7 +126,7 @@ void spPathConstraint_apply (spPathConstraint* self) {
 	}
 
 	positions = spPathConstraint_computeWorldPositions(self, attachment, spacesCount, tangents,
-											 data->positionMode == SP_POSITION_MODE_PERCENT, spacingMode == SP_SPACING_MODE_PERCENT);
+		data->positionMode == SP_POSITION_MODE_PERCENT, spacingMode == SP_SPACING_MODE_PERCENT);
 	skeleton = self->target->bone->skeleton;
 	skeletonX = skeleton->x, skeletonY = skeleton->y;
 	boneX = positions[0], boneY = positions[1], offsetRotation = self->data->offsetRotation;
@@ -192,7 +192,7 @@ static void _addAfterPosition (float p, float* temp, int i, float* out, int o) {
 }
 
 static void _addCurvePosition (float p, float x1, float y1, float cx1, float cy1, float cx2, float cy2, float x2, float y2,
-							   float* out, int o, int/*bool*/tangents) {
+		float* out, int o, int/*bool*/tangents) {
 	float tt, ttt, u, uu, uuu;
 	float ut, ut3, uut3, utt3;
 	float x, y;
@@ -283,7 +283,7 @@ float* spPathConstraint_computeWorldPositions(spPathConstraint* self, spPathAtta
 					spPathAttachment_computeWorldVertices1(path, target, curve * 6 + 2, 8, world, 0);
 			}
 			_addCurvePosition(p, world[0], world[1], world[2], world[3], world[4], world[5], world[6], world[7], out, o,
-							 tangents || (i > 0 && space == 0));
+				tangents || (i > 0 && space == 0));
 		}
 		return out;
 	}
diff --git a/spine-c/src/spine/SkeletonJson.c b/spine-c/src/spine/SkeletonJson.c
index bd6f49c40..21bb53c5f 100644
--- a/spine-c/src/spine/SkeletonJson.c
+++ b/spine-c/src/spine/SkeletonJson.c
@@ -353,7 +353,7 @@ static spAnimation* _spSkeletonJson_readAnimation (spSkeletonJson* self, Json* r
 				timeline->pathConstraintIndex = constraintIndex;
 				for (valueMap = timelineMap->child, frameIndex = 0; valueMap; valueMap = valueMap->next, ++frameIndex) {
 					spPathConstraintMixTimeline_setFrame(timeline, frameIndex, Json_getFloat(valueMap, "time", 0),
-														 Json_getFloat(valueMap, "rotateMix", 1), Json_getFloat(valueMap, "translateMix", 1));
+						Json_getFloat(valueMap, "rotateMix", 1), Json_getFloat(valueMap, "translateMix", 1));
 					readCurve(valueMap, SUPER(timeline), frameIndex);
 				}
 				animation->timelines[animation->timelinesCount++] = SUPER_CAST(spTimeline, timeline);
@@ -576,14 +576,14 @@ spSkeletonData* spSkeletonJson_readSkeletonData (spSkeletonJson* self, const cha
 	oldLocale = strdup(setlocale(LC_NUMERIC, NULL));
 	setlocale(LC_NUMERIC, "C");
 #endif
-    
+
 	root = Json_create(json);
-    
+
 #ifndef __ANDROID__
 	setlocale(LC_NUMERIC, oldLocale);
 	free(oldLocale);
 #endif
-    
+
 	if (!root) {
 		_spSkeletonJson_setError(self, 0, "Invalid skeleton JSON: ", Json_getError());
 		return 0;
@@ -594,7 +594,7 @@ spSkeletonData* spSkeletonJson_readSkeletonData (spSkeletonJson* self, const cha
 	skeleton = Json_getItem(root, "skeleton");
 	if (skeleton) {
 		MALLOC_STR(skeletonData->hash, Json_getString(skeleton, "hash", 0));
-		MALLOC_STR(skeletonData->version,  Json_getString(skeleton, "spine", 0));
+		MALLOC_STR(skeletonData->version, Json_getString(skeleton, "spine", 0));
 		skeletonData->width = Json_getFloat(skeleton, "width", 0);
 		skeletonData->height = Json_getFloat(skeleton, "height", 0);
 	}
diff --git a/spine-corona/config.lua b/spine-corona/config.lua
index 643443087..af8c3f22d 100644
--- a/spine-corona/config.lua
+++ b/spine-corona/config.lua
@@ -1,7 +1,7 @@
 application = {
 	content = {
 		width = 320,
-		height = 480, 
+		height = 480,
 		scale = "letterBox",
 		fps = 60,
 	},
diff --git a/spine-corona/main.lua b/spine-corona/main.lua
index 01ac6bce9..819b3f57c 100644
--- a/spine-corona/main.lua
+++ b/spine-corona/main.lua
@@ -7,56 +7,56 @@ local activeSkeleton = 1
 local lastTime = 0
 
 function loadSkeleton(atlasFile, jsonFile, x, y, scale, animation, skin)
-  -- to load an atlas, we need to define a function that returns
-  -- a Corona paint object. This allows you to resolve images
-  -- however you see fit
-  local imageLoader = function (path) 
-    local paint = { type = "image", filename = "data/" .. path }
-    return paint
-  end
-  
-  -- load the atlas
-  local atlas = spine.TextureAtlas.new(spine.utils.readFile("data/" .. atlasFile), imageLoader)
-  
-  -- load the JSON and create a Skeleton from it
-  local json = spine.SkeletonJson.new(spine.AtlasAttachmentLoader.new(atlas))
-  json.scale = scale
-  local skeletonData = json:readSkeletonDataFile("data/" .. jsonFile)
-  local skeleton = spine.Skeleton.new(skeletonData)
-  skeleton.flipY = true -- Corona's coordinate system has its y-axis point downwards
-  skeleton.group.x = x
-  skeleton.group.y = y
-  
-  -- Set the skin if we got one
-  if skin then skeleton:setSkin(skin) end
-  
-  -- create an animation state object to apply animations to the skeleton
-  local animationStateData = spine.AnimationStateData.new(skeletonData)
-  local animationState = spine.AnimationState.new(animationStateData)
-  animationState:setAnimationByName(0, animation, true)
-  
-  -- set the skeleton invisible
-  skeleton.group.isVisible = false
-  
-  -- set a name on the group of the skeleton so we can find it during debugging
-  skeleton.group.name = jsonFile
-  
-  -- set some event callbacks
-  animationState.onStart = function (trackIndex)
-    print(trackIndex.." start: "..animationState:getCurrent(trackIndex).animation.name)
-  end
-  animationState.onEnd = function (trackIndex)
-    print(trackIndex.." end: "..animationState:getCurrent(trackIndex).animation.name)
-  end
-  animationState.onComplete = function (trackIndex, loopCount)
-    print(trackIndex.." complete: "..animationState:getCurrent(trackIndex).animation.name..", "..loopCount)
-  end
-  animationState.onEvent = function (trackIndex, event)
-    print(trackIndex.." event: "..animationState:getCurrent(trackIndex).animation.name..", "..event.data.name..", "..event.intValue..", "..event.floatValue..", '"..(event.stringValue or "").."'")
-  end
-  
-  -- return the skeleton an animation state
-  return { skeleton = skeleton, state = animationState }
+	-- to load an atlas, we need to define a function that returns
+	-- a Corona paint object. This allows you to resolve images
+	-- however you see fit
+	local imageLoader = function (path)
+		local paint = { type = "image", filename = "data/" .. path }
+		return paint
+	end
+
+	-- load the atlas
+	local atlas = spine.TextureAtlas.new(spine.utils.readFile("data/" .. atlasFile), imageLoader)
+
+	-- load the JSON and create a Skeleton from it
+	local json = spine.SkeletonJson.new(spine.AtlasAttachmentLoader.new(atlas))
+	json.scale = scale
+	local skeletonData = json:readSkeletonDataFile("data/" .. jsonFile)
+	local skeleton = spine.Skeleton.new(skeletonData)
+	skeleton.flipY = true -- Corona's coordinate system has its y-axis point downwards
+	skeleton.group.x = x
+	skeleton.group.y = y
+
+	-- Set the skin if we got one
+	if skin then skeleton:setSkin(skin) end
+
+	-- create an animation state object to apply animations to the skeleton
+	local animationStateData = spine.AnimationStateData.new(skeletonData)
+	local animationState = spine.AnimationState.new(animationStateData)
+	animationState:setAnimationByName(0, animation, true)
+
+	-- set the skeleton invisible
+	skeleton.group.isVisible = false
+
+	-- set a name on the group of the skeleton so we can find it during debugging
+	skeleton.group.name = jsonFile
+
+	-- set some event callbacks
+	animationState.onStart = function (trackIndex)
+		print(trackIndex.." start: "..animationState:getCurrent(trackIndex).animation.name)
+	end
+	animationState.onEnd = function (trackIndex)
+		print(trackIndex.." end: "..animationState:getCurrent(trackIndex).animation.name)
+	end
+	animationState.onComplete = function (trackIndex, loopCount)
+		print(trackIndex.." complete: "..animationState:getCurrent(trackIndex).animation.name..", "..loopCount)
+	end
+	animationState.onEvent = function (trackIndex, event)
+		print(trackIndex.." event: "..animationState:getCurrent(trackIndex).animation.name..", "..event.data.name..", "..event.intValue..", "..event.floatValue..", '"..(event.stringValue or "").."'")
+	end
+
+	-- return the skeleton an animation state
+	return { skeleton = skeleton, state = animationState }
 end
 
 table.insert(skeletons, loadSkeleton("spineboy.atlas", "spineboy.json", 240, 300, 0.4, "walk"))
@@ -68,26 +68,26 @@ table.insert(skeletons, loadSkeleton("vine.atlas", "vine.json", 240, 300, 0.3, "
 
 display.setDefault("background", 0.2, 0.2, 0.2, 1)
 
-Runtime:addEventListener("enterFrame", function (event)        
+Runtime:addEventListener("enterFrame", function (event)
 	local currentTime = event.time / 1000
 	local delta = currentTime - lastTime
-	lastTime = currentTime  
-  
-  skeleton = skeletons[activeSkeleton].skeleton
-  skeleton.group.isVisible = true
-  state = skeletons[activeSkeleton].state
-  
-  state:update(delta)
-  state:apply(skeleton)
-  skeleton:updateWorldTransform()
-  
-  -- uncomment if you want to know how many batches a skeleton renders to
-  -- print(skeleton.batches)
+	lastTime = currentTime
+
+	skeleton = skeletons[activeSkeleton].skeleton
+	skeleton.group.isVisible = true
+	state = skeletons[activeSkeleton].state
+
+	state:update(delta)
+	state:apply(skeleton)
+	skeleton:updateWorldTransform()
+
+	-- uncomment if you want to know how many batches a skeleton renders to
+	-- print(skeleton.batches)
 end)
-    
+
 Runtime:addEventListener("tap", function(event)
-  skeletons[activeSkeleton].skeleton.group.isVisible = false
-  activeSkeleton = activeSkeleton + 1
-  if activeSkeleton > #skeletons then activeSkeleton = 1 end
-  skeletons[activeSkeleton].skeleton.group.isVisible = true
+	skeletons[activeSkeleton].skeleton.group.isVisible = false
+	activeSkeleton = activeSkeleton + 1
+	if activeSkeleton > #skeletons then activeSkeleton = 1 end
+	skeletons[activeSkeleton].skeleton.group.isVisible = true
 end)
\ No newline at end of file
diff --git a/spine-corona/mobdebug.lua b/spine-corona/mobdebug.lua
index 31ef8af06..57e891ea2 100644
--- a/spine-corona/mobdebug.lua
+++ b/spine-corona/mobdebug.lua
@@ -5,13 +5,13 @@
 --
 
 local mobdebug = {
-  _NAME = "mobdebug",
-  _VERSION = 0.542,
-  _COPYRIGHT = "Paul Kulchenko",
-  _DESCRIPTION = "Mobile Remote Debugger for the Lua programming language",
-  port = os and os.getenv and os.getenv("MOBDEBUG_PORT") or 8172,
-  checkcount = 200,
-  yieldtimeout = 0.02,
+	_NAME = "mobdebug",
+	_VERSION = 0.542,
+	_COPYRIGHT = "Paul Kulchenko",
+	_DESCRIPTION = "Mobile Remote Debugger for the Lua programming language",
+	port = os and os.getenv and os.getenv("MOBDEBUG_PORT") or 8172,
+	checkcount = 200,
+	yieldtimeout = 0.02,
 }
 
 local coroutine = coroutine
@@ -41,21 +41,21 @@ local jit = rawget(genv, "jit")
 local MOAICoroutine = rawget(genv, "MOAICoroutine")
 
 if not setfenv then -- Lua 5.2
-  -- based on http://lua-users.org/lists/lua-l/2010-06/msg00314.html
-  -- this assumes f is a function
-  local function findenv(f)
-    local level = 1
-    repeat
-      local name, value = debug.getupvalue(f, level)
-      if name == '_ENV' then return level, value end
-      level = level + 1
-    until name == nil
-    return nil end
-  getfenv = function (f) return(select(2, findenv(f)) or _G) end
-  setfenv = function (f, t)
-    local level = findenv(f)
-    if level then debug.setupvalue(f, level, t) end
-    return f end
+	-- based on http://lua-users.org/lists/lua-l/2010-06/msg00314.html
+	-- this assumes f is a function
+	local function findenv(f)
+		local level = 1
+		repeat
+			local name, value = debug.getupvalue(f, level)
+			if name == '_ENV' then return level, value end
+			level = level + 1
+		until name == nil
+		return nil end
+	getfenv = function (f) return(select(2, findenv(f)) or _G) end
+	setfenv = function (f, t)
+		local level = findenv(f)
+		if level then debug.setupvalue(f, level, t) end
+		return f end
 end
 
 -- check for OS and convert file names to lower case on windows
@@ -63,9 +63,9 @@ end
 -- breakpoint on x:\Foo.lua will not work if the file was loaded as X:\foo.lua.
 -- OSX and Windows behave the same way (case insensitive, but case preserving)
 local iscasepreserving = os and os.getenv and (os.getenv('WINDIR')
-  or (os.getenv('OS') or ''):match('[Ww]indows')
-  or os.getenv('DYLD_LIBRARY_PATH'))
-  or not io.open("/proc")
+	or (os.getenv('OS') or ''):match('[Ww]indows')
+	or os.getenv('DYLD_LIBRARY_PATH'))
+	or not io.open("/proc")
 
 -- turn jit off based on Mike Pall's comment in this discussion:
 -- http://www.freelists.org/post/luajit/Debug-hooks-and-JIT,2
@@ -98,9 +98,9 @@ local iobase = {print = print}
 local basedir = ""
 local deferror = "execution aborted at default debugee"
 local debugee = function () 
-  local a = 1
-  for _ = 1, 10 do a = a + 1 end
-  error(deferror)
+	local a = 1
+	for _ = 1, 10 do a = a + 1 end
+	error(deferror)
 end
 local function q(s) return s:gsub('([%(%)%.%%%+%-%*%?%[%^%$%]])','%%%1') end
 
@@ -111,1335 +111,1335 @@ local snum = {[tostring(1/0)]='1/0 --[[math.huge]]',[tostring(-1/0)]='-1/0 --[[-
 local badtype = {thread = true, userdata = true, cdata = true}
 local keyword, globals, G = {}, {}, (_G or _ENV)
 for _,k in ipairs({'and', 'break', 'do', 'else', 'elseif', 'end', 'false',
-  'for', 'function', 'goto', 'if', 'in', 'local', 'nil', 'not', 'or', 'repeat',
-  'return', 'then', 'true', 'until', 'while'}) do keyword[k] = true end
+	'for', 'function', 'goto', 'if', 'in', 'local', 'nil', 'not', 'or', 'repeat',
+	'return', 'then', 'true', 'until', 'while'}) do keyword[k] = true end
 for k,v in pairs(G) do globals[v] = k end -- build func to name mapping
 for _,g in ipairs({'coroutine', 'debug', 'io', 'math', 'string', 'table', 'os'}) do
-  for k,v in pairs(G[g]) do globals[v] = g..'.'..k end end
+	for k,v in pairs(G[g]) do globals[v] = g..'.'..k end end
 
 local function s(t, opts)
-  local name, indent, fatal, maxnum = opts.name, opts.indent, opts.fatal, opts.maxnum
-  local sparse, custom, huge = opts.sparse, opts.custom, not opts.nohuge
-  local space, maxl = (opts.compact and '' or ' '), (opts.maxlevel or math.huge)
-  local iname, comm = '_'..(name or ''), opts.comment and (tonumber(opts.comment) or math.huge)
-  local seen, sref, syms, symn = {}, {'local '..iname..'={}'}, {}, 0
-  local function gensym(val) return '_'..(tostring(tostring(val)):gsub("[^%w]",""):gsub("(%d%w+)",
-    -- tostring(val) is needed because __tostring may return a non-string value
-    function(s) if not syms[s] then symn = symn+1; syms[s] = symn end return syms[s] end)) end
-  local function safestr(s) return type(s) == "number" and (huge and snum[tostring(s)] or s)
-    or type(s) ~= "string" and tostring(s) -- escape NEWLINE/010 and EOF/026
-    or ("%q"):format(s):gsub("\010","n"):gsub("\026","\\026") end
-  local function comment(s,l) return comm and (l or 0) < comm and ' --[['..tostring(s)..']]' or '' end
-  local function globerr(s,l) return globals[s] and globals[s]..comment(s,l) or not fatal
-    and safestr(select(2, pcall(tostring, s))) or error("Can't serialize "..tostring(s)) end
-  local function safename(path, name) -- generates foo.bar, foo[3], or foo['b a r']
-    local n = name == nil and '' or name
-    local plain = type(n) == "string" and n:match("^[%l%u_][%w_]*$") and not keyword[n]
-    local safe = plain and n or '['..safestr(n)..']'
-    return (path or '')..(plain and path and '.' or '')..safe, safe end
-  local alphanumsort = type(opts.sortkeys) == 'function' and opts.sortkeys or function(k, o, n)  -- k=keys, o=originaltable, n=padding
-    local maxn, to = tonumber(n) or 12, {number = 'a', string = 'b'}
-    local function padnum(d) return ("%0"..maxn.."d"):format(d) end
-    table.sort(k, function(a,b)
-      -- sort numeric keys first: k[key] is non-nil for numeric keys
-      return (k[a] and 0 or to[type(a)] or 'z')..(tostring(a):gsub("%d+",padnum))
-           < (k[b] and 0 or to[type(b)] or 'z')..(tostring(b):gsub("%d+",padnum)) end) end
-  local function val2str(t, name, indent, insref, path, plainindex, level)
-    local ttype, level, mt = type(t), (level or 0), getmetatable(t)
-    local spath, sname = safename(path, name)
-    local tag = plainindex and
-      ((type(name) == "number") and '' or name..space..'='..space) or
-      (name ~= nil and sname..space..'='..space or '')
-    if seen[t] then -- already seen this element
-      sref[#sref+1] = spath..space..'='..space..seen[t]
-      return tag..'nil'..comment('ref', level) end
-    if type(mt) == 'table' and (mt.__serialize or mt.__tostring) then -- knows how to serialize itself
-      seen[t] = insref or spath
-      if mt.__serialize then t = mt.__serialize(t) else t = tostring(t) end
-      ttype = type(t) end -- new value falls through to be serialized
-    if ttype == "table" then
-      if level >= maxl then return tag..'{}'..comment('max', level) end
-      seen[t] = insref or spath
-      if next(t) == nil then return tag..'{}'..comment(t, level) end -- table empty
-      local maxn, o, out = math.min(#t, maxnum or #t), {}, {}
-      for key = 1, maxn do o[key] = key end
-      if not maxnum or #o < maxnum then
-        local n = #o -- n = n + 1; o[n] is much faster than o[#o+1] on large tables
-        for key in pairs(t) do if o[key] ~= key then n = n + 1; o[n] = key end end end
-      if maxnum and #o > maxnum then o[maxnum+1] = nil end
-      if opts.sortkeys and #o > maxn then alphanumsort(o, t, opts.sortkeys) end
-      local sparse = sparse and #o > maxn -- disable sparsness if only numeric keys (shorter output)
-      for n, key in ipairs(o) do
-        local value, ktype, plainindex = t[key], type(key), n <= maxn and not sparse
-        if opts.valignore and opts.valignore[value] -- skip ignored values; do nothing
-        or opts.keyallow and not opts.keyallow[key]
-        or opts.valtypeignore and opts.valtypeignore[type(value)] -- skipping ignored value types
-        or sparse and value == nil then -- skipping nils; do nothing
-        elseif ktype == 'table' or ktype == 'function' or badtype[ktype] then
-          if not seen[key] and not globals[key] then
-            sref[#sref+1] = 'placeholder'
-            local sname = safename(iname, gensym(key)) -- iname is table for local variables
-            sref[#sref] = val2str(key,sname,indent,sname,iname,true) end
-          sref[#sref+1] = 'placeholder'
-          local path = seen[t]..'['..(seen[key] or globals[key] or gensym(key))..']'
-          sref[#sref] = path..space..'='..space..(seen[value] or val2str(value,nil,indent,path))
-        else
-          out[#out+1] = val2str(value,key,indent,insref,seen[t],plainindex,level+1)
-        end
-      end
-      local prefix = string.rep(indent or '', level)
-      local head = indent and '{\n'..prefix..indent or '{'
-      local body = table.concat(out, ','..(indent and '\n'..prefix..indent or space))
-      local tail = indent and "\n"..prefix..'}' or '}'
-      return (custom and custom(tag,head,body,tail) or tag..head..body..tail)..comment(t, level)
-    elseif badtype[ttype] then
-      seen[t] = insref or spath
-      return tag..globerr(t, level)
-    elseif ttype == 'function' then
-      seen[t] = insref or spath
-      local ok, res = pcall(string.dump, t)
-      local func = ok and ((opts.nocode and "function() --[[..skipped..]] end" or
-        "loadstring("..safestr(res)..",'@serialized')")..comment(t, level))
-      return tag..(func or globerr(t, level))
-    else return tag..safestr(t) end -- handle all other types
-  end
-  local sepr = indent and "\n" or ";"..space
-  local body = val2str(t, name, indent) -- this call also populates sref
-  local tail = #sref>1 and table.concat(sref, sepr)..sepr or ''
-  local warn = opts.comment and #sref>1 and space.."--[[incomplete output with shared/self-references skipped]]" or ''
-  return not name and body..warn or "do local "..body..sepr..tail.."return "..name..sepr.."end"
+	local name, indent, fatal, maxnum = opts.name, opts.indent, opts.fatal, opts.maxnum
+	local sparse, custom, huge = opts.sparse, opts.custom, not opts.nohuge
+	local space, maxl = (opts.compact and '' or ' '), (opts.maxlevel or math.huge)
+	local iname, comm = '_'..(name or ''), opts.comment and (tonumber(opts.comment) or math.huge)
+	local seen, sref, syms, symn = {}, {'local '..iname..'={}'}, {}, 0
+	local function gensym(val) return '_'..(tostring(tostring(val)):gsub("[^%w]",""):gsub("(%d%w+)",
+		-- tostring(val) is needed because __tostring may return a non-string value
+		function(s) if not syms[s] then symn = symn+1; syms[s] = symn end return syms[s] end)) end
+	local function safestr(s) return type(s) == "number" and (huge and snum[tostring(s)] or s)
+		or type(s) ~= "string" and tostring(s) -- escape NEWLINE/010 and EOF/026
+		or ("%q"):format(s):gsub("\010","n"):gsub("\026","\\026") end
+	local function comment(s,l) return comm and (l or 0) < comm and ' --[['..tostring(s)..']]' or '' end
+	local function globerr(s,l) return globals[s] and globals[s]..comment(s,l) or not fatal
+		and safestr(select(2, pcall(tostring, s))) or error("Can't serialize "..tostring(s)) end
+	local function safename(path, name) -- generates foo.bar, foo[3], or foo['b a r']
+		local n = name == nil and '' or name
+		local plain = type(n) == "string" and n:match("^[%l%u_][%w_]*$") and not keyword[n]
+		local safe = plain and n or '['..safestr(n)..']'
+		return (path or '')..(plain and path and '.' or '')..safe, safe end
+	local alphanumsort = type(opts.sortkeys) == 'function' and opts.sortkeys or function(k, o, n)	 -- k=keys, o=originaltable, n=padding
+		local maxn, to = tonumber(n) or 12, {number = 'a', string = 'b'}
+		local function padnum(d) return ("%0"..maxn.."d"):format(d) end
+		table.sort(k, function(a,b)
+			-- sort numeric keys first: k[key] is non-nil for numeric keys
+			return (k[a] and 0 or to[type(a)] or 'z')..(tostring(a):gsub("%d+",padnum))
+					 < (k[b] and 0 or to[type(b)] or 'z')..(tostring(b):gsub("%d+",padnum)) end) end
+	local function val2str(t, name, indent, insref, path, plainindex, level)
+		local ttype, level, mt = type(t), (level or 0), getmetatable(t)
+		local spath, sname = safename(path, name)
+		local tag = plainindex and
+			((type(name) == "number") and '' or name..space..'='..space) or
+			(name ~= nil and sname..space..'='..space or '')
+		if seen[t] then -- already seen this element
+			sref[#sref+1] = spath..space..'='..space..seen[t]
+			return tag..'nil'..comment('ref', level) end
+		if type(mt) == 'table' and (mt.__serialize or mt.__tostring) then -- knows how to serialize itself
+			seen[t] = insref or spath
+			if mt.__serialize then t = mt.__serialize(t) else t = tostring(t) end
+			ttype = type(t) end -- new value falls through to be serialized
+		if ttype == "table" then
+			if level >= maxl then return tag..'{}'..comment('max', level) end
+			seen[t] = insref or spath
+			if next(t) == nil then return tag..'{}'..comment(t, level) end -- table empty
+			local maxn, o, out = math.min(#t, maxnum or #t), {}, {}
+			for key = 1, maxn do o[key] = key end
+			if not maxnum or #o < maxnum then
+				local n = #o -- n = n + 1; o[n] is much faster than o[#o+1] on large tables
+				for key in pairs(t) do if o[key] ~= key then n = n + 1; o[n] = key end end end
+			if maxnum and #o > maxnum then o[maxnum+1] = nil end
+			if opts.sortkeys and #o > maxn then alphanumsort(o, t, opts.sortkeys) end
+			local sparse = sparse and #o > maxn -- disable sparsness if only numeric keys (shorter output)
+			for n, key in ipairs(o) do
+				local value, ktype, plainindex = t[key], type(key), n <= maxn and not sparse
+				if opts.valignore and opts.valignore[value] -- skip ignored values; do nothing
+				or opts.keyallow and not opts.keyallow[key]
+				or opts.valtypeignore and opts.valtypeignore[type(value)] -- skipping ignored value types
+				or sparse and value == nil then -- skipping nils; do nothing
+				elseif ktype == 'table' or ktype == 'function' or badtype[ktype] then
+					if not seen[key] and not globals[key] then
+						sref[#sref+1] = 'placeholder'
+						local sname = safename(iname, gensym(key)) -- iname is table for local variables
+						sref[#sref] = val2str(key,sname,indent,sname,iname,true) end
+					sref[#sref+1] = 'placeholder'
+					local path = seen[t]..'['..(seen[key] or globals[key] or gensym(key))..']'
+					sref[#sref] = path..space..'='..space..(seen[value] or val2str(value,nil,indent,path))
+				else
+					out[#out+1] = val2str(value,key,indent,insref,seen[t],plainindex,level+1)
+				end
+			end
+			local prefix = string.rep(indent or '', level)
+			local head = indent and '{\n'..prefix..indent or '{'
+			local body = table.concat(out, ','..(indent and '\n'..prefix..indent or space))
+			local tail = indent and "\n"..prefix..'}' or '}'
+			return (custom and custom(tag,head,body,tail) or tag..head..body..tail)..comment(t, level)
+		elseif badtype[ttype] then
+			seen[t] = insref or spath
+			return tag..globerr(t, level)
+		elseif ttype == 'function' then
+			seen[t] = insref or spath
+			local ok, res = pcall(string.dump, t)
+			local func = ok and ((opts.nocode and "function() --[[..skipped..]] end" or
+				"loadstring("..safestr(res)..",'@serialized')")..comment(t, level))
+			return tag..(func or globerr(t, level))
+		else return tag..safestr(t) end -- handle all other types
+	end
+	local sepr = indent and "\n" or ";"..space
+	local body = val2str(t, name, indent) -- this call also populates sref
+	local tail = #sref>1 and table.concat(sref, sepr)..sepr or ''
+	local warn = opts.comment and #sref>1 and space.."--[[incomplete output with shared/self-references skipped]]" or ''
+	return not name and body..warn or "do local "..body..sepr..tail.."return "..name..sepr.."end"
 end
 
 local function merge(a, b) if b then for k,v in pairs(b) do a[k] = v end end; return a; end
 return { _NAME = n, _COPYRIGHT = c, _DESCRIPTION = d, _VERSION = v, serialize = s,
-  dump = function(a, opts) return s(a, merge({name = '_', compact = true, sparse = true}, opts)) end,
-  line = function(a, opts) return s(a, merge({sortkeys = true, comment = true}, opts)) end,
-  block = function(a, opts) return s(a, merge({indent = '  ', sortkeys = true, comment = true}, opts)) end }
+	dump = function(a, opts) return s(a, merge({name = '_', compact = true, sparse = true}, opts)) end,
+	line = function(a, opts) return s(a, merge({sortkeys = true, comment = true}, opts)) end,
+	block = function(a, opts) return s(a, merge({indent = '	 ', sortkeys = true, comment = true}, opts)) end }
 end)() ---- end of Serpent module
 
 local function removebasedir(path, basedir)
-  if iscasepreserving then
-    -- check if the lowercased path matches the basedir
-    -- if so, return substring of the original path (to not lowercase it)
-    return path:lower():find('^'..q(basedir:lower()))
-      and path:sub(#basedir+1) or path
-  else
-    return string.gsub(path, '^'..q(basedir), '')
-  end
+	if iscasepreserving then
+		-- check if the lowercased path matches the basedir
+		-- if so, return substring of the original path (to not lowercase it)
+		return path:lower():find('^'..q(basedir:lower()))
+			and path:sub(#basedir+1) or path
+	else
+		return string.gsub(path, '^'..q(basedir), '')
+	end
 end
 
 local function stack(start)
-  local function vars(f)
-    local func = debug.getinfo(f, "f").func
-    local i = 1
-    local locals = {}
-    while true do
-      local name, value = debug.getlocal(f, i)
-      if not name then break end
-      if string.sub(name, 1, 1) ~= '(' then locals[name] = {value, tostring(value)} end
-      i = i + 1
-    end
-    i = 1
-    local ups = {}
-    while func and true do -- check for func as it may be nil for tail calls
-      local name, value = debug.getupvalue(func, i)
-      if not name then break end
-      ups[name] = {value, tostring(value)}
-      i = i + 1
-    end
-    return locals, ups
-  end
+	local function vars(f)
+		local func = debug.getinfo(f, "f").func
+		local i = 1
+		local locals = {}
+		while true do
+			local name, value = debug.getlocal(f, i)
+			if not name then break end
+			if string.sub(name, 1, 1) ~= '(' then locals[name] = {value, tostring(value)} end
+			i = i + 1
+		end
+		i = 1
+		local ups = {}
+		while func and true do -- check for func as it may be nil for tail calls
+			local name, value = debug.getupvalue(func, i)
+			if not name then break end
+			ups[name] = {value, tostring(value)}
+			i = i + 1
+		end
+		return locals, ups
+	end
 
-  local stack = {}
-  for i = (start or 0), 100 do
-    local source = debug.getinfo(i, "Snl")
-    if not source then break end
+	local stack = {}
+	for i = (start or 0), 100 do
+		local source = debug.getinfo(i, "Snl")
+		if not source then break end
 
-    local src = source.source
-    if src:find("@") == 1 then
-      src = src:sub(2):gsub("\\", "/")
-      if src:find("%./") == 1 then src = src:sub(3) end
-    end
+		local src = source.source
+		if src:find("@") == 1 then
+			src = src:sub(2):gsub("\\", "/")
+			if src:find("%./") == 1 then src = src:sub(3) end
+		end
 
-    table.insert(stack, { -- remove basedir from source
-      {source.name, removebasedir(src, basedir), source.linedefined,
-       source.currentline, source.what, source.namewhat, source.short_src},
-      vars(i+1)})
-    if source.what == 'main' then break end
-  end
-  return stack
+		table.insert(stack, { -- remove basedir from source
+			{source.name, removebasedir(src, basedir), source.linedefined,
+			 source.currentline, source.what, source.namewhat, source.short_src},
+			vars(i+1)})
+		if source.what == 'main' then break end
+	end
+	return stack
 end
 
 local function set_breakpoint(file, line)
-  if file == '-' and lastfile then file = lastfile
-  elseif iscasepreserving then file = string.lower(file) end
-  if not breakpoints[line] then breakpoints[line] = {} end
-  breakpoints[line][file] = true
+	if file == '-' and lastfile then file = lastfile
+	elseif iscasepreserving then file = string.lower(file) end
+	if not breakpoints[line] then breakpoints[line] = {} end
+	breakpoints[line][file] = true
 end
 
 local function remove_breakpoint(file, line)
-  if file == '-' and lastfile then file = lastfile
-  elseif iscasepreserving then file = string.lower(file) end
-  if breakpoints[line] then breakpoints[line][file] = nil end
+	if file == '-' and lastfile then file = lastfile
+	elseif iscasepreserving then file = string.lower(file) end
+	if breakpoints[line] then breakpoints[line][file] = nil end
 end
 
 local function has_breakpoint(file, line)
-  return breakpoints[line]
-     and breakpoints[line][iscasepreserving and string.lower(file) or file]
+	return breakpoints[line]
+		 and breakpoints[line][iscasepreserving and string.lower(file) or file]
 end
 
 local function restore_vars(vars)
-  if type(vars) ~= 'table' then return end
+	if type(vars) ~= 'table' then return end
 
-  -- locals need to be processed in the reverse order, starting from
-  -- the inner block out, to make sure that the localized variables
-  -- are correctly updated with only the closest variable with
-  -- the same name being changed
-  -- first loop find how many local variables there is, while
-  -- the second loop processes them from i to 1
-  local i = 1
-  while true do
-    local name = debug.getlocal(3, i)
-    if not name then break end
-    i = i + 1
-  end
-  i = i - 1
-  local written_vars = {}
-  while i > 0 do
-    local name = debug.getlocal(3, i)
-    if not written_vars[name] then
-      if string.sub(name, 1, 1) ~= '(' then
-        debug.setlocal(3, i, rawget(vars, name))
-      end
-      written_vars[name] = true
-    end
-    i = i - 1
-  end
+	-- locals need to be processed in the reverse order, starting from
+	-- the inner block out, to make sure that the localized variables
+	-- are correctly updated with only the closest variable with
+	-- the same name being changed
+	-- first loop find how many local variables there is, while
+	-- the second loop processes them from i to 1
+	local i = 1
+	while true do
+		local name = debug.getlocal(3, i)
+		if not name then break end
+		i = i + 1
+	end
+	i = i - 1
+	local written_vars = {}
+	while i > 0 do
+		local name = debug.getlocal(3, i)
+		if not written_vars[name] then
+			if string.sub(name, 1, 1) ~= '(' then
+				debug.setlocal(3, i, rawget(vars, name))
+			end
+			written_vars[name] = true
+		end
+		i = i - 1
+	end
 
-  i = 1
-  local func = debug.getinfo(3, "f").func
-  while true do
-    local name = debug.getupvalue(func, i)
-    if not name then break end
-    if not written_vars[name] then
-      if string.sub(name, 1, 1) ~= '(' then
-        debug.setupvalue(func, i, rawget(vars, name))
-      end
-      written_vars[name] = true
-    end
-    i = i + 1
-  end
+	i = 1
+	local func = debug.getinfo(3, "f").func
+	while true do
+		local name = debug.getupvalue(func, i)
+		if not name then break end
+		if not written_vars[name] then
+			if string.sub(name, 1, 1) ~= '(' then
+				debug.setupvalue(func, i, rawget(vars, name))
+			end
+			written_vars[name] = true
+		end
+		i = i + 1
+	end
 end
 
 local function capture_vars(level)
-  local vars = {}
-  local func = debug.getinfo(level or 3, "f").func
-  local i = 1
-  while true do
-    local name, value = debug.getupvalue(func, i)
-    if not name then break end
-    if string.sub(name, 1, 1) ~= '(' then vars[name] = value end
-    i = i + 1
-  end
-  i = 1
-  while true do
-    local name, value = debug.getlocal(level or 3, i)
-    if not name then break end
-    if string.sub(name, 1, 1) ~= '(' then vars[name] = value end
-    i = i + 1
-  end
-  -- returned 'vars' table plays a dual role: (1) it captures local values
-  -- and upvalues to be restored later (in case they are modified in "eval"),
-  -- and (2) it provides an environment for evaluated chunks.
-  -- getfenv(func) is needed to provide proper environment for functions,
-  -- including access to globals, but this causes vars[name] to fail in
-  -- restore_vars on local variables or upvalues with `nil` values when
-  -- 'strict' is in effect. To avoid this `rawget` is used in restore_vars.
-  setmetatable(vars, { __index = getfenv(func), __newindex = getfenv(func) })
-  return vars
+	local vars = {}
+	local func = debug.getinfo(level or 3, "f").func
+	local i = 1
+	while true do
+		local name, value = debug.getupvalue(func, i)
+		if not name then break end
+		if string.sub(name, 1, 1) ~= '(' then vars[name] = value end
+		i = i + 1
+	end
+	i = 1
+	while true do
+		local name, value = debug.getlocal(level or 3, i)
+		if not name then break end
+		if string.sub(name, 1, 1) ~= '(' then vars[name] = value end
+		i = i + 1
+	end
+	-- returned 'vars' table plays a dual role: (1) it captures local values
+	-- and upvalues to be restored later (in case they are modified in "eval"),
+	-- and (2) it provides an environment for evaluated chunks.
+	-- getfenv(func) is needed to provide proper environment for functions,
+	-- including access to globals, but this causes vars[name] to fail in
+	-- restore_vars on local variables or upvalues with `nil` values when
+	-- 'strict' is in effect. To avoid this `rawget` is used in restore_vars.
+	setmetatable(vars, { __index = getfenv(func), __newindex = getfenv(func) })
+	return vars
 end
 
 local function stack_depth(start_depth)
-  for i = start_depth, 0, -1 do
-    if debug.getinfo(i, "l") then return i+1 end
-  end
-  return start_depth
+	for i = start_depth, 0, -1 do
+		if debug.getinfo(i, "l") then return i+1 end
+	end
+	return start_depth
 end
 
 local function is_safe(stack_level)
-  -- the stack grows up: 0 is getinfo, 1 is is_safe, 2 is debug_hook, 3 is user function
-  if stack_level == 3 then return true end
-  for i = 3, stack_level do
-    -- return if it is not safe to abort
-    local info = debug.getinfo(i, "S")
-    if not info then return true end
-    if info.what == "C" then return false end
-  end
-  return true
+	-- the stack grows up: 0 is getinfo, 1 is is_safe, 2 is debug_hook, 3 is user function
+	if stack_level == 3 then return true end
+	for i = 3, stack_level do
+		-- return if it is not safe to abort
+		local info = debug.getinfo(i, "S")
+		if not info then return true end
+		if info.what == "C" then return false end
+	end
+	return true
 end
 
 local function in_debugger()
-  local this = debug.getinfo(1, "S").source
-  -- only need to check few frames as mobdebug frames should be close
-  for i = 3, 7 do
-    local info = debug.getinfo(i, "S")
-    if not info then return false end
-    if info.source == this then return true end
-  end
-  return false
+	local this = debug.getinfo(1, "S").source
+	-- only need to check few frames as mobdebug frames should be close
+	for i = 3, 7 do
+		local info = debug.getinfo(i, "S")
+		if not info then return false end
+		if info.source == this then return true end
+	end
+	return false
 end
 
 local function is_pending(peer)
-  -- if there is something already in the buffer, skip check
-  if not buf and checkcount >= mobdebug.checkcount then
-    peer:settimeout(0) -- non-blocking
-    buf = peer:receive(1)
-    peer:settimeout() -- back to blocking
-    checkcount = 0
-  end
-  return buf
+	-- if there is something already in the buffer, skip check
+	if not buf and checkcount >= mobdebug.checkcount then
+		peer:settimeout(0) -- non-blocking
+		buf = peer:receive(1)
+		peer:settimeout() -- back to blocking
+		checkcount = 0
+	end
+	return buf
 end
 
 local function debug_hook(event, line)
-  -- (1) LuaJIT needs special treatment. Because debug_hook is set for
-  -- *all* coroutines, and not just the one being debugged as in regular Lua
-  -- (http://lua-users.org/lists/lua-l/2011-06/msg00513.html),
-  -- need to avoid debugging mobdebug's own code as LuaJIT doesn't
-  -- always correctly generate call/return hook events (there are more
-  -- calls than returns, which breaks stack depth calculation and
-  -- 'step' and 'step over' commands stop working; possibly because
-  -- 'tail return' events are not generated by LuaJIT).
-  -- the next line checks if the debugger is run under LuaJIT and if
-  -- one of debugger methods is present in the stack, it simply returns.
-  if jit then
-    -- when luajit is compiled with LUAJIT_ENABLE_LUA52COMPAT,
-    -- coroutine.running() returns non-nil for the main thread.
-    local coro, main = coroutine.running()
-    if not coro or main then coro = 'main' end
-    local disabled = coroutines[coro] == false
-      or coroutines[coro] == nil and coro ~= (coro_debugee or 'main')
-    if coro_debugee and disabled or not coro_debugee and (disabled or in_debugger())
-    then return end
-  end
+	-- (1) LuaJIT needs special treatment. Because debug_hook is set for
+	-- *all* coroutines, and not just the one being debugged as in regular Lua
+	-- (http://lua-users.org/lists/lua-l/2011-06/msg00513.html),
+	-- need to avoid debugging mobdebug's own code as LuaJIT doesn't
+	-- always correctly generate call/return hook events (there are more
+	-- calls than returns, which breaks stack depth calculation and
+	-- 'step' and 'step over' commands stop working; possibly because
+	-- 'tail return' events are not generated by LuaJIT).
+	-- the next line checks if the debugger is run under LuaJIT and if
+	-- one of debugger methods is present in the stack, it simply returns.
+	if jit then
+		-- when luajit is compiled with LUAJIT_ENABLE_LUA52COMPAT,
+		-- coroutine.running() returns non-nil for the main thread.
+		local coro, main = coroutine.running()
+		if not coro or main then coro = 'main' end
+		local disabled = coroutines[coro] == false
+			or coroutines[coro] == nil and coro ~= (coro_debugee or 'main')
+		if coro_debugee and disabled or not coro_debugee and (disabled or in_debugger())
+		then return end
+	end
 
-  -- (2) check if abort has been requested and it's safe to abort
-  if abort and is_safe(stack_level) then error(abort) end
+	-- (2) check if abort has been requested and it's safe to abort
+	if abort and is_safe(stack_level) then error(abort) end
 
-  -- (3) also check if this debug hook has not been visited for any reason.
-  -- this check is needed to avoid stepping in too early
-  -- (for example, when coroutine.resume() is executed inside start()).
-  if not seen_hook and in_debugger() then return end
+	-- (3) also check if this debug hook has not been visited for any reason.
+	-- this check is needed to avoid stepping in too early
+	-- (for example, when coroutine.resume() is executed inside start()).
+	if not seen_hook and in_debugger() then return end
 
-  if event == "call" then
-    stack_level = stack_level + 1
-  elseif event == "return" or event == "tail return" then
-    stack_level = stack_level - 1
-  elseif event == "line" then
-    -- may need to fall through because of the following:
-    -- (1) step_into
-    -- (2) step_over and stack_level <= step_level (need stack_level)
-    -- (3) breakpoint; check for line first as it's known; then for file
-    -- (4) socket call (only do every Xth check)
-    -- (5) at least one watch is registered
-    if not (
-      step_into or step_over or breakpoints[line] or watchescnt > 0
-      or is_pending(server)
-    ) then checkcount = checkcount + 1; return end
+	if event == "call" then
+		stack_level = stack_level + 1
+	elseif event == "return" or event == "tail return" then
+		stack_level = stack_level - 1
+	elseif event == "line" then
+		-- may need to fall through because of the following:
+		-- (1) step_into
+		-- (2) step_over and stack_level <= step_level (need stack_level)
+		-- (3) breakpoint; check for line first as it's known; then for file
+		-- (4) socket call (only do every Xth check)
+		-- (5) at least one watch is registered
+		if not (
+			step_into or step_over or breakpoints[line] or watchescnt > 0
+			or is_pending(server)
+		) then checkcount = checkcount + 1; return end
 
-    checkcount = mobdebug.checkcount -- force check on the next command
+		checkcount = mobdebug.checkcount -- force check on the next command
 
-    -- this is needed to check if the stack got shorter or longer.
-    -- unfortunately counting call/return calls is not reliable.
-    -- the discrepancy may happen when "pcall(load, '')" call is made
-    -- or when "error()" is called in a function.
-    -- in either case there are more "call" than "return" events reported.
-    -- this validation is done for every "line" event, but should be "cheap"
-    -- as it checks for the stack to get shorter (or longer by one call).
-    -- start from one level higher just in case we need to grow the stack.
-    -- this may happen after coroutine.resume call to a function that doesn't
-    -- have any other instructions to execute. it triggers three returns:
-    -- "return, tail return, return", which needs to be accounted for.
-    stack_level = stack_depth(stack_level+1)
+		-- this is needed to check if the stack got shorter or longer.
+		-- unfortunately counting call/return calls is not reliable.
+		-- the discrepancy may happen when "pcall(load, '')" call is made
+		-- or when "error()" is called in a function.
+		-- in either case there are more "call" than "return" events reported.
+		-- this validation is done for every "line" event, but should be "cheap"
+		-- as it checks for the stack to get shorter (or longer by one call).
+		-- start from one level higher just in case we need to grow the stack.
+		-- this may happen after coroutine.resume call to a function that doesn't
+		-- have any other instructions to execute. it triggers three returns:
+		-- "return, tail return, return", which needs to be accounted for.
+		stack_level = stack_depth(stack_level+1)
 
-    local caller = debug.getinfo(2, "S")
+		local caller = debug.getinfo(2, "S")
 
-    -- grab the filename and fix it if needed
-    local file = lastfile
-    if (lastsource ~= caller.source) then
-      file, lastsource = caller.source, caller.source
-      -- technically, users can supply names that may not use '@',
-      -- for example when they call loadstring('...', 'filename.lua').
-      -- Unfortunately, there is no reliable/quick way to figure out
-      -- what is the filename and what is the source code.
-      -- The following will work if the supplied filename uses Unix path.
-      if file:find("^@") then
-        file = file:gsub("^@", ""):gsub("\\", "/")
-        -- need this conversion to be applied to relative and absolute
-        -- file names as you may write "require 'Foo'" to
-        -- load "foo.lua" (on a case insensitive file system) and breakpoints
-        -- set on foo.lua will not work if not converted to the same case.
-        if iscasepreserving then file = string.lower(file) end
-        if file:find("%./") == 1 then file = file:sub(3)
-        else file = file:gsub('^'..q(basedir), '') end
-        -- some file systems allow newlines in file names; remove these.
-        file = file:gsub("\n", ' ')
-      else
-        -- this is either a file name coming from loadstring("chunk", "file"),
-        -- or the actual source code that needs to be serialized (as it may
-        -- include newlines); assume it's a file name if it's all on one line.
-        file = file:find("[\r\n]") and serpent.line(file) or file
-      end
+		-- grab the filename and fix it if needed
+		local file = lastfile
+		if (lastsource ~= caller.source) then
+			file, lastsource = caller.source, caller.source
+			-- technically, users can supply names that may not use '@',
+			-- for example when they call loadstring('...', 'filename.lua').
+			-- Unfortunately, there is no reliable/quick way to figure out
+			-- what is the filename and what is the source code.
+			-- The following will work if the supplied filename uses Unix path.
+			if file:find("^@") then
+				file = file:gsub("^@", ""):gsub("\\", "/")
+				-- need this conversion to be applied to relative and absolute
+				-- file names as you may write "require 'Foo'" to
+				-- load "foo.lua" (on a case insensitive file system) and breakpoints
+				-- set on foo.lua will not work if not converted to the same case.
+				if iscasepreserving then file = string.lower(file) end
+				if file:find("%./") == 1 then file = file:sub(3)
+				else file = file:gsub('^'..q(basedir), '') end
+				-- some file systems allow newlines in file names; remove these.
+				file = file:gsub("\n", ' ')
+			else
+				-- this is either a file name coming from loadstring("chunk", "file"),
+				-- or the actual source code that needs to be serialized (as it may
+				-- include newlines); assume it's a file name if it's all on one line.
+				file = file:find("[\r\n]") and serpent.line(file) or file
+			end
 
-      -- set to true if we got here; this only needs to be done once per
-      -- session, so do it here to at least avoid setting it for every line.
-      seen_hook = true
-      lastfile = file
-    end
+			-- set to true if we got here; this only needs to be done once per
+			-- session, so do it here to at least avoid setting it for every line.
+			seen_hook = true
+			lastfile = file
+		end
 
-    local vars, status, res
-    if (watchescnt > 0) then
-      vars = capture_vars()
-      for index, value in pairs(watches) do
-        setfenv(value, vars)
-        local ok, fired = pcall(value)
-        if ok and fired then
-          status, res = coroutine.resume(coro_debugger, events.WATCH, vars, file, line, index)
-          break -- any one watch is enough; don't check multiple times
-        end
-      end
-    end
+		local vars, status, res
+		if (watchescnt > 0) then
+			vars = capture_vars()
+			for index, value in pairs(watches) do
+				setfenv(value, vars)
+				local ok, fired = pcall(value)
+				if ok and fired then
+					status, res = coroutine.resume(coro_debugger, events.WATCH, vars, file, line, index)
+					break -- any one watch is enough; don't check multiple times
+				end
+			end
+		end
 
-    -- need to get into the "regular" debug handler, but only if there was
-    -- no watch that was fired. If there was a watch, handle its result.
-    local getin = (status == nil) and
-      (step_into
-      or (step_over and stack_level <= step_level)
-      or has_breakpoint(file, line)
-      or is_pending(server))
+		-- need to get into the "regular" debug handler, but only if there was
+		-- no watch that was fired. If there was a watch, handle its result.
+		local getin = (status == nil) and
+			(step_into
+			or (step_over and stack_level <= step_level)
+			or has_breakpoint(file, line)
+			or is_pending(server))
 
-    if getin then
-      vars = vars or capture_vars()
-      step_into = false
-      step_over = false
-      status, res = coroutine.resume(coro_debugger, events.BREAK, vars, file, line)
-    end
+		if getin then
+			vars = vars or capture_vars()
+			step_into = false
+			step_over = false
+			status, res = coroutine.resume(coro_debugger, events.BREAK, vars, file, line)
+		end
 
-    -- handle 'stack' command that provides stack() information to the debugger
-    if status and res == 'stack' then
-      while status and res == 'stack' do
-        -- resume with the stack trace and variables
-        if vars then restore_vars(vars) end -- restore vars so they are reflected in stack values
-        -- this may fail if __tostring method fails at run-time
-        local ok, snapshot = pcall(stack, 4)
-        status, res = coroutine.resume(coro_debugger, ok and events.STACK or events.BREAK, snapshot, file, line)
-      end
-    end
+		-- handle 'stack' command that provides stack() information to the debugger
+		if status and res == 'stack' then
+			while status and res == 'stack' do
+				-- resume with the stack trace and variables
+				if vars then restore_vars(vars) end -- restore vars so they are reflected in stack values
+				-- this may fail if __tostring method fails at run-time
+				local ok, snapshot = pcall(stack, 4)
+				status, res = coroutine.resume(coro_debugger, ok and events.STACK or events.BREAK, snapshot, file, line)
+			end
+		end
 
-    -- need to recheck once more as resume after 'stack' command may
-    -- return something else (for example, 'exit'), which needs to be handled
-    if status and res and res ~= 'stack' then
-      if abort == nil and res == "exit" then os.exit(1); return end
-      abort = res
-      -- only abort if safe; if not, there is another (earlier) check inside
-      -- debug_hook, which will abort execution at the first safe opportunity
-      if is_safe(stack_level) then error(abort) end
-    elseif not status and res then
-      error(res, 2) -- report any other (internal) errors back to the application
-    end
+		-- need to recheck once more as resume after 'stack' command may
+		-- return something else (for example, 'exit'), which needs to be handled
+		if status and res and res ~= 'stack' then
+			if abort == nil and res == "exit" then os.exit(1); return end
+			abort = res
+			-- only abort if safe; if not, there is another (earlier) check inside
+			-- debug_hook, which will abort execution at the first safe opportunity
+			if is_safe(stack_level) then error(abort) end
+		elseif not status and res then
+			error(res, 2) -- report any other (internal) errors back to the application
+		end
 
-    if vars then restore_vars(vars) end
-  end
+		if vars then restore_vars(vars) end
+	end
 end
 
 local function stringify_results(status, ...)
-  if not status then return status, ... end -- on error report as it
+	if not status then return status, ... end -- on error report as it
 
-  local t = {...}
-  for i,v in pairs(t) do -- stringify each of the returned values
-    local ok, res = pcall(serpent.line, v, {nocode = true, comment = 1})
-    t[i] = ok and res or ("%q"):format(res):gsub("\010","n"):gsub("\026","\\026")
-  end
-  -- stringify table with all returned values
-  -- this is done to allow each returned value to be used (serialized or not)
-  -- intependently and to preserve "original" comments
-  return pcall(serpent.dump, t, {sparse = false})
+	local t = {...}
+	for i,v in pairs(t) do -- stringify each of the returned values
+		local ok, res = pcall(serpent.line, v, {nocode = true, comment = 1})
+		t[i] = ok and res or ("%q"):format(res):gsub("\010","n"):gsub("\026","\\026")
+	end
+	-- stringify table with all returned values
+	-- this is done to allow each returned value to be used (serialized or not)
+	-- intependently and to preserve "original" comments
+	return pcall(serpent.dump, t, {sparse = false})
 end
 
 local function debugger_loop(sev, svars, sfile, sline)
-  local command
-  local app, osname
-  local eval_env = svars or {}
-  local function emptyWatch () return false end
-  local loaded = {}
-  for k in pairs(package.loaded) do loaded[k] = true end
+	local command
+	local app, osname
+	local eval_env = svars or {}
+	local function emptyWatch () return false end
+	local loaded = {}
+	for k in pairs(package.loaded) do loaded[k] = true end
 
-  while true do
-    local line, err
-    local wx = rawget(genv, "wx") -- use rawread to make strict.lua happy
-    if (wx or mobdebug.yield) and server.settimeout then server:settimeout(mobdebug.yieldtimeout) end
-    while true do
-      line, err = server:receive()
-      if not line and err == "timeout" then
-        -- yield for wx GUI applications if possible to avoid "busyness"
-        app = app or (wx and wx.wxGetApp and wx.wxGetApp())
-        if app then
-          local win = app:GetTopWindow()
-          local inloop = app:IsMainLoopRunning()
-          osname = osname or wx.wxPlatformInfo.Get():GetOperatingSystemFamilyName()
-          if win and not inloop then
-            -- process messages in a regular way
-            -- and exit as soon as the event loop is idle
-            if osname == 'Unix' then wx.wxTimer(app):Start(10, true) end
-            local exitLoop = function()
-              win:Disconnect(wx.wxID_ANY, wx.wxID_ANY, wx.wxEVT_IDLE)
-              win:Disconnect(wx.wxID_ANY, wx.wxID_ANY, wx.wxEVT_TIMER)
-              app:ExitMainLoop()
-            end
-            win:Connect(wx.wxEVT_IDLE, exitLoop)
-            win:Connect(wx.wxEVT_TIMER, exitLoop)
-            app:MainLoop()
-          end
-        elseif mobdebug.yield then mobdebug.yield()
-        end
-      elseif not line and err == "closed" then
-        error("Debugger connection unexpectedly closed", 0)
-      else
-        -- if there is something in the pending buffer, prepend it to the line
-        if buf then line = buf .. line; buf = nil end
-        break
-      end
-    end
-    if server.settimeout then server:settimeout() end -- back to blocking
-    command = string.sub(line, string.find(line, "^[A-Z]+"))
-    if command == "SETB" then
-      local _, _, _, file, line = string.find(line, "^([A-Z]+)%s+(.-)%s+(%d+)%s*$")
-      if file and line then
-        set_breakpoint(file, tonumber(line))
-        server:send("200 OK\n")
-      else
-        server:send("400 Bad Request\n")
-      end
-    elseif command == "DELB" then
-      local _, _, _, file, line = string.find(line, "^([A-Z]+)%s+(.-)%s+(%d+)%s*$")
-      if file and line then
-        remove_breakpoint(file, tonumber(line))
-        server:send("200 OK\n")
-      else
-        server:send("400 Bad Request\n")
-      end
-    elseif command == "EXEC" then
-      local _, _, chunk = string.find(line, "^[A-Z]+%s+(.+)$")
-      if chunk then 
-        local func, res = loadstring(chunk)
-        local status
-        if func then
-          setfenv(func, eval_env)
-          status, res = stringify_results(pcall(func))
-        end
-        if status then
-          server:send("200 OK " .. #res .. "\n")
-          server:send(res)
-        else
-          server:send("401 Error in Expression " .. #res .. "\n")
-          server:send(res)
-        end
-      else
-        server:send("400 Bad Request\n")
-      end
-    elseif command == "LOAD" then
-      local _, _, size, name = string.find(line, "^[A-Z]+%s+(%d+)%s+(%S.-)%s*$")
-      size = tonumber(size)
+	while true do
+		local line, err
+		local wx = rawget(genv, "wx") -- use rawread to make strict.lua happy
+		if (wx or mobdebug.yield) and server.settimeout then server:settimeout(mobdebug.yieldtimeout) end
+		while true do
+			line, err = server:receive()
+			if not line and err == "timeout" then
+				-- yield for wx GUI applications if possible to avoid "busyness"
+				app = app or (wx and wx.wxGetApp and wx.wxGetApp())
+				if app then
+					local win = app:GetTopWindow()
+					local inloop = app:IsMainLoopRunning()
+					osname = osname or wx.wxPlatformInfo.Get():GetOperatingSystemFamilyName()
+					if win and not inloop then
+						-- process messages in a regular way
+						-- and exit as soon as the event loop is idle
+						if osname == 'Unix' then wx.wxTimer(app):Start(10, true) end
+						local exitLoop = function()
+							win:Disconnect(wx.wxID_ANY, wx.wxID_ANY, wx.wxEVT_IDLE)
+							win:Disconnect(wx.wxID_ANY, wx.wxID_ANY, wx.wxEVT_TIMER)
+							app:ExitMainLoop()
+						end
+						win:Connect(wx.wxEVT_IDLE, exitLoop)
+						win:Connect(wx.wxEVT_TIMER, exitLoop)
+						app:MainLoop()
+					end
+				elseif mobdebug.yield then mobdebug.yield()
+				end
+			elseif not line and err == "closed" then
+				error("Debugger connection unexpectedly closed", 0)
+			else
+				-- if there is something in the pending buffer, prepend it to the line
+				if buf then line = buf .. line; buf = nil end
+				break
+			end
+		end
+		if server.settimeout then server:settimeout() end -- back to blocking
+		command = string.sub(line, string.find(line, "^[A-Z]+"))
+		if command == "SETB" then
+			local _, _, _, file, line = string.find(line, "^([A-Z]+)%s+(.-)%s+(%d+)%s*$")
+			if file and line then
+				set_breakpoint(file, tonumber(line))
+				server:send("200 OK\n")
+			else
+				server:send("400 Bad Request\n")
+			end
+		elseif command == "DELB" then
+			local _, _, _, file, line = string.find(line, "^([A-Z]+)%s+(.-)%s+(%d+)%s*$")
+			if file and line then
+				remove_breakpoint(file, tonumber(line))
+				server:send("200 OK\n")
+			else
+				server:send("400 Bad Request\n")
+			end
+		elseif command == "EXEC" then
+			local _, _, chunk = string.find(line, "^[A-Z]+%s+(.+)$")
+			if chunk then 
+				local func, res = loadstring(chunk)
+				local status
+				if func then
+					setfenv(func, eval_env)
+					status, res = stringify_results(pcall(func))
+				end
+				if status then
+					server:send("200 OK " .. #res .. "\n")
+					server:send(res)
+				else
+					server:send("401 Error in Expression " .. #res .. "\n")
+					server:send(res)
+				end
+			else
+				server:send("400 Bad Request\n")
+			end
+		elseif command == "LOAD" then
+			local _, _, size, name = string.find(line, "^[A-Z]+%s+(%d+)%s+(%S.-)%s*$")
+			size = tonumber(size)
 
-      if abort == nil then -- no LOAD/RELOAD allowed inside start()
-        if size > 0 then server:receive(size) end
-        if sfile and sline then
-          server:send("201 Started " .. sfile .. " " .. sline .. "\n")
-        else
-          server:send("200 OK 0\n")
-        end
-      else
-        -- reset environment to allow required modules to load again
-        -- remove those packages that weren't loaded when debugger started
-        for k in pairs(package.loaded) do
-          if not loaded[k] then package.loaded[k] = nil end
-        end
+			if abort == nil then -- no LOAD/RELOAD allowed inside start()
+				if size > 0 then server:receive(size) end
+				if sfile and sline then
+					server:send("201 Started " .. sfile .. " " .. sline .. "\n")
+				else
+					server:send("200 OK 0\n")
+				end
+			else
+				-- reset environment to allow required modules to load again
+				-- remove those packages that weren't loaded when debugger started
+				for k in pairs(package.loaded) do
+					if not loaded[k] then package.loaded[k] = nil end
+				end
 
-        if size == 0 and name == '-' then -- RELOAD the current script being debugged
-          server:send("200 OK 0\n")
-          coroutine.yield("load")
-        else
-          -- receiving 0 bytes blocks (at least in luasocket 2.0.2), so skip reading
-          local chunk = size == 0 and "" or server:receive(size)
-          if chunk then -- LOAD a new script for debugging
-            local func, res = loadstring(chunk, "@"..name)
-            if func then
-              server:send("200 OK 0\n")
-              debugee = func
-              coroutine.yield("load")
-            else
-              server:send("401 Error in Expression " .. #res .. "\n")
-              server:send(res)
-            end
-          else
-            server:send("400 Bad Request\n")
-          end
-        end
-      end
-    elseif command == "SETW" then
-      local _, _, exp = string.find(line, "^[A-Z]+%s+(.+)%s*$")
-      if exp then 
-        local func, res = loadstring("return(" .. exp .. ")")
-        if func then
-          watchescnt = watchescnt + 1
-          local newidx = #watches + 1
-          watches[newidx] = func
-          server:send("200 OK " .. newidx .. "\n") 
-        else
-          server:send("401 Error in Expression " .. #res .. "\n")
-          server:send(res)
-        end
-      else
-        server:send("400 Bad Request\n")
-      end
-    elseif command == "DELW" then
-      local _, _, index = string.find(line, "^[A-Z]+%s+(%d+)%s*$")
-      index = tonumber(index)
-      if index > 0 and index <= #watches then
-        watchescnt = watchescnt - (watches[index] ~= emptyWatch and 1 or 0)
-        watches[index] = emptyWatch
-        server:send("200 OK\n")
-      else
-        server:send("400 Bad Request\n")
-      end
-    elseif command == "RUN" then
-      server:send("200 OK\n")
+				if size == 0 and name == '-' then -- RELOAD the current script being debugged
+					server:send("200 OK 0\n")
+					coroutine.yield("load")
+				else
+					-- receiving 0 bytes blocks (at least in luasocket 2.0.2), so skip reading
+					local chunk = size == 0 and "" or server:receive(size)
+					if chunk then -- LOAD a new script for debugging
+						local func, res = loadstring(chunk, "@"..name)
+						if func then
+							server:send("200 OK 0\n")
+							debugee = func
+							coroutine.yield("load")
+						else
+							server:send("401 Error in Expression " .. #res .. "\n")
+							server:send(res)
+						end
+					else
+						server:send("400 Bad Request\n")
+					end
+				end
+			end
+		elseif command == "SETW" then
+			local _, _, exp = string.find(line, "^[A-Z]+%s+(.+)%s*$")
+			if exp then 
+				local func, res = loadstring("return(" .. exp .. ")")
+				if func then
+					watchescnt = watchescnt + 1
+					local newidx = #watches + 1
+					watches[newidx] = func
+					server:send("200 OK " .. newidx .. "\n") 
+				else
+					server:send("401 Error in Expression " .. #res .. "\n")
+					server:send(res)
+				end
+			else
+				server:send("400 Bad Request\n")
+			end
+		elseif command == "DELW" then
+			local _, _, index = string.find(line, "^[A-Z]+%s+(%d+)%s*$")
+			index = tonumber(index)
+			if index > 0 and index <= #watches then
+				watchescnt = watchescnt - (watches[index] ~= emptyWatch and 1 or 0)
+				watches[index] = emptyWatch
+				server:send("200 OK\n")
+			else
+				server:send("400 Bad Request\n")
+			end
+		elseif command == "RUN" then
+			server:send("200 OK\n")
 
-      local ev, vars, file, line, idx_watch = coroutine.yield()
-      eval_env = vars
-      if ev == events.BREAK then
-        server:send("202 Paused " .. file .. " " .. line .. "\n")
-      elseif ev == events.WATCH then
-        server:send("203 Paused " .. file .. " " .. line .. " " .. idx_watch .. "\n")
-      elseif ev == events.RESTART then
-        -- nothing to do
-      else
-        server:send("401 Error in Execution " .. #file .. "\n")
-        server:send(file)
-      end
-    elseif command == "STEP" then
-      server:send("200 OK\n")
-      step_into = true
+			local ev, vars, file, line, idx_watch = coroutine.yield()
+			eval_env = vars
+			if ev == events.BREAK then
+				server:send("202 Paused " .. file .. " " .. line .. "\n")
+			elseif ev == events.WATCH then
+				server:send("203 Paused " .. file .. " " .. line .. " " .. idx_watch .. "\n")
+			elseif ev == events.RESTART then
+				-- nothing to do
+			else
+				server:send("401 Error in Execution " .. #file .. "\n")
+				server:send(file)
+			end
+		elseif command == "STEP" then
+			server:send("200 OK\n")
+			step_into = true
 
-      local ev, vars, file, line, idx_watch = coroutine.yield()
-      eval_env = vars
-      if ev == events.BREAK then
-        server:send("202 Paused " .. file .. " " .. line .. "\n")
-      elseif ev == events.WATCH then
-        server:send("203 Paused " .. file .. " " .. line .. " " .. idx_watch .. "\n")
-      elseif ev == events.RESTART then
-        -- nothing to do
-      else
-        server:send("401 Error in Execution " .. #file .. "\n")
-        server:send(file)
-      end
-    elseif command == "OVER" or command == "OUT" then
-      server:send("200 OK\n")
-      step_over = true
-      
-      -- OVER and OUT are very similar except for 
-      -- the stack level value at which to stop
-      if command == "OUT" then step_level = stack_level - 1
-      else step_level = stack_level end
+			local ev, vars, file, line, idx_watch = coroutine.yield()
+			eval_env = vars
+			if ev == events.BREAK then
+				server:send("202 Paused " .. file .. " " .. line .. "\n")
+			elseif ev == events.WATCH then
+				server:send("203 Paused " .. file .. " " .. line .. " " .. idx_watch .. "\n")
+			elseif ev == events.RESTART then
+				-- nothing to do
+			else
+				server:send("401 Error in Execution " .. #file .. "\n")
+				server:send(file)
+			end
+		elseif command == "OVER" or command == "OUT" then
+			server:send("200 OK\n")
+			step_over = true
+			
+			-- OVER and OUT are very similar except for 
+			-- the stack level value at which to stop
+			if command == "OUT" then step_level = stack_level - 1
+			else step_level = stack_level end
 
-      local ev, vars, file, line, idx_watch = coroutine.yield()
-      eval_env = vars
-      if ev == events.BREAK then
-        server:send("202 Paused " .. file .. " " .. line .. "\n")
-      elseif ev == events.WATCH then
-        server:send("203 Paused " .. file .. " " .. line .. " " .. idx_watch .. "\n")
-      elseif ev == events.RESTART then
-        -- nothing to do
-      else
-        server:send("401 Error in Execution " .. #file .. "\n")
-        server:send(file)
-      end
-    elseif command == "BASEDIR" then
-      local _, _, dir = string.find(line, "^[A-Z]+%s+(.+)%s*$")
-      if dir then
-        basedir = iscasepreserving and string.lower(dir) or dir
-        -- reset cached source as it may change with basedir
-        lastsource = nil
-        server:send("200 OK\n")
-      else
-        server:send("400 Bad Request\n")
-      end
-    elseif command == "SUSPEND" then
-      -- do nothing; it already fulfilled its role
-    elseif command == "STACK" then
-      -- first check if we can execute the stack command
-      -- as it requires yielding back to debug_hook it cannot be executed
-      -- if we have not seen the hook yet as happens after start().
-      -- in this case we simply return an empty result
-      local vars, ev = {}
-      if seen_hook then
-        ev, vars = coroutine.yield("stack")
-      end
-      if ev and ev ~= events.STACK then
-        server:send("401 Error in Execution " .. #vars .. "\n")
-        server:send(vars)
-      else
-        local ok, res = pcall(serpent.dump, vars, {nocode = true, sparse = false})
-        if ok then
-          server:send("200 OK " .. res .. "\n")
-        else
-          server:send("401 Error in Execution " .. #res .. "\n")
-          server:send(res)
-        end
-      end
-    elseif command == "OUTPUT" then
-      local _, _, stream, mode = string.find(line, "^[A-Z]+%s+(%w+)%s+([dcr])%s*$")
-      if stream and mode and stream == "stdout" then
-        -- assign "print" in the global environment
-        genv.print = mode == 'd' and iobase.print or coroutine.wrap(function(...)
-          -- wrapping into coroutine.wrap protects this function from
-          -- being stepped through in the debugger
-          local tbl = {...}
-          while true do
-            if mode == 'c' then iobase.print(unpack(tbl)) end
-            for n = 1, #tbl do
-              tbl[n] = select(2, pcall(serpent.line, tbl[n], {nocode = true, comment = false})) end
-            local file = table.concat(tbl, "\t").."\n"
-            server:send("204 Output " .. stream .. " " .. #file .. "\n" .. file)
-            tbl = {coroutine.yield()}
-          end
-        end)
-        server:send("200 OK\n")
-      else
-        server:send("400 Bad Request\n")
-      end
-    elseif command == "EXIT" then
-      server:send("200 OK\n")
-      coroutine.yield("exit")
-    else
-      server:send("400 Bad Request\n")
-    end
-  end
+			local ev, vars, file, line, idx_watch = coroutine.yield()
+			eval_env = vars
+			if ev == events.BREAK then
+				server:send("202 Paused " .. file .. " " .. line .. "\n")
+			elseif ev == events.WATCH then
+				server:send("203 Paused " .. file .. " " .. line .. " " .. idx_watch .. "\n")
+			elseif ev == events.RESTART then
+				-- nothing to do
+			else
+				server:send("401 Error in Execution " .. #file .. "\n")
+				server:send(file)
+			end
+		elseif command == "BASEDIR" then
+			local _, _, dir = string.find(line, "^[A-Z]+%s+(.+)%s*$")
+			if dir then
+				basedir = iscasepreserving and string.lower(dir) or dir
+				-- reset cached source as it may change with basedir
+				lastsource = nil
+				server:send("200 OK\n")
+			else
+				server:send("400 Bad Request\n")
+			end
+		elseif command == "SUSPEND" then
+			-- do nothing; it already fulfilled its role
+		elseif command == "STACK" then
+			-- first check if we can execute the stack command
+			-- as it requires yielding back to debug_hook it cannot be executed
+			-- if we have not seen the hook yet as happens after start().
+			-- in this case we simply return an empty result
+			local vars, ev = {}
+			if seen_hook then
+				ev, vars = coroutine.yield("stack")
+			end
+			if ev and ev ~= events.STACK then
+				server:send("401 Error in Execution " .. #vars .. "\n")
+				server:send(vars)
+			else
+				local ok, res = pcall(serpent.dump, vars, {nocode = true, sparse = false})
+				if ok then
+					server:send("200 OK " .. res .. "\n")
+				else
+					server:send("401 Error in Execution " .. #res .. "\n")
+					server:send(res)
+				end
+			end
+		elseif command == "OUTPUT" then
+			local _, _, stream, mode = string.find(line, "^[A-Z]+%s+(%w+)%s+([dcr])%s*$")
+			if stream and mode and stream == "stdout" then
+				-- assign "print" in the global environment
+				genv.print = mode == 'd' and iobase.print or coroutine.wrap(function(...)
+					-- wrapping into coroutine.wrap protects this function from
+					-- being stepped through in the debugger
+					local tbl = {...}
+					while true do
+						if mode == 'c' then iobase.print(unpack(tbl)) end
+						for n = 1, #tbl do
+							tbl[n] = select(2, pcall(serpent.line, tbl[n], {nocode = true, comment = false})) end
+						local file = table.concat(tbl, "\t").."\n"
+						server:send("204 Output " .. stream .. " " .. #file .. "\n" .. file)
+						tbl = {coroutine.yield()}
+					end
+				end)
+				server:send("200 OK\n")
+			else
+				server:send("400 Bad Request\n")
+			end
+		elseif command == "EXIT" then
+			server:send("200 OK\n")
+			coroutine.yield("exit")
+		else
+			server:send("400 Bad Request\n")
+		end
+	end
 end
 
 local function connect(controller_host, controller_port)
-  return (socket.connect4 or socket.connect)(controller_host, controller_port)
+	return (socket.connect4 or socket.connect)(controller_host, controller_port)
 end
 
 local function isrunning()
-  return coro_debugger and coroutine.status(coro_debugger) == 'suspended'
+	return coro_debugger and coroutine.status(coro_debugger) == 'suspended'
 end
 
 local lasthost, lastport
 
 -- Starts a debug session by connecting to a controller
 local function start(controller_host, controller_port)
-  -- only one debugging session can be run (as there is only one debug hook)
-  if isrunning() then return end
+	-- only one debugging session can be run (as there is only one debug hook)
+	if isrunning() then return end
 
-  lasthost = controller_host or lasthost
-  lastport = controller_port or lastport
+	lasthost = controller_host or lasthost
+	lastport = controller_port or lastport
 
-  controller_host = lasthost or "localhost"
-  controller_port = lastport or mobdebug.port
+	controller_host = lasthost or "localhost"
+	controller_port = lastport or mobdebug.port
 
-  local err
-  server, err = (socket.connect4 or socket.connect)(controller_host, controller_port)
-  if server then
-    -- correct stack depth which already has some calls on it
-    -- so it doesn't go into negative when those calls return
-    -- as this breaks subsequence checks in stack_depth().
-    -- start from 16th frame, which is sufficiently large for this check.
-    stack_level = stack_depth(16)
+	local err
+	server, err = (socket.connect4 or socket.connect)(controller_host, controller_port)
+	if server then
+		-- correct stack depth which already has some calls on it
+		-- so it doesn't go into negative when those calls return
+		-- as this breaks subsequence checks in stack_depth().
+		-- start from 16th frame, which is sufficiently large for this check.
+		stack_level = stack_depth(16)
 
-    -- provide our own traceback function to report the error remotely
-    do
-      local dtraceback = debug.traceback
-      debug.traceback = function (...)
-        if select('#', ...) >= 1 then
-          local err, lvl = ...
-          if err and type(err) ~= 'thread' then
-            local trace = dtraceback(err, (lvl or 2)+1)
-            if genv.print == iobase.print then -- no remote redirect
-              return trace
-            else
-              genv.print(trace) -- report the error remotely
-              return -- don't report locally to avoid double reporting
-            end
-          end
-        end
-        -- direct call to debug.traceback: return the original.
-        -- debug.traceback(nil, level) doesn't work in Lua 5.1
-        -- (http://lua-users.org/lists/lua-l/2011-06/msg00574.html), so
-        -- simply remove first frame from the stack trace
-        return (dtraceback(...):gsub("(stack traceback:\n)[^\n]*\n", "%1"))
-      end
-    end
-    coro_debugger = coroutine.create(debugger_loop)
-    debug.sethook(debug_hook, "lcr")
-    seen_hook = nil -- reset in case the last start() call was refused
-    step_into = true -- start with step command
-    return true
-  else
-    print(("Could not connect to %s:%s: %s")
-      :format(controller_host, controller_port, err or "unknown error"))
-  end
+		-- provide our own traceback function to report the error remotely
+		do
+			local dtraceback = debug.traceback
+			debug.traceback = function (...)
+				if select('#', ...) >= 1 then
+					local err, lvl = ...
+					if err and type(err) ~= 'thread' then
+						local trace = dtraceback(err, (lvl or 2)+1)
+						if genv.print == iobase.print then -- no remote redirect
+							return trace
+						else
+							genv.print(trace) -- report the error remotely
+							return -- don't report locally to avoid double reporting
+						end
+					end
+				end
+				-- direct call to debug.traceback: return the original.
+				-- debug.traceback(nil, level) doesn't work in Lua 5.1
+				-- (http://lua-users.org/lists/lua-l/2011-06/msg00574.html), so
+				-- simply remove first frame from the stack trace
+				return (dtraceback(...):gsub("(stack traceback:\n)[^\n]*\n", "%1"))
+			end
+		end
+		coro_debugger = coroutine.create(debugger_loop)
+		debug.sethook(debug_hook, "lcr")
+		seen_hook = nil -- reset in case the last start() call was refused
+		step_into = true -- start with step command
+		return true
+	else
+		print(("Could not connect to %s:%s: %s")
+			:format(controller_host, controller_port, err or "unknown error"))
+	end
 end
 
 local function controller(controller_host, controller_port, scratchpad)
-  -- only one debugging session can be run (as there is only one debug hook)
-  if isrunning() then return end
+	-- only one debugging session can be run (as there is only one debug hook)
+	if isrunning() then return end
 
-  lasthost = controller_host or lasthost
-  lastport = controller_port or lastport
+	lasthost = controller_host or lasthost
+	lastport = controller_port or lastport
 
-  controller_host = lasthost or "localhost"
-  controller_port = lastport or mobdebug.port
+	controller_host = lasthost or "localhost"
+	controller_port = lastport or mobdebug.port
 
-  local exitonerror = not scratchpad
-  local err
-  server, err = (socket.connect4 or socket.connect)(controller_host, controller_port)
-  if server then
-    local function report(trace, err)
-      local msg = err .. "\n" .. trace
-      server:send("401 Error in Execution " .. #msg .. "\n")
-      server:send(msg)
-      return err
-    end
+	local exitonerror = not scratchpad
+	local err
+	server, err = (socket.connect4 or socket.connect)(controller_host, controller_port)
+	if server then
+		local function report(trace, err)
+			local msg = err .. "\n" .. trace
+			server:send("401 Error in Execution " .. #msg .. "\n")
+			server:send(msg)
+			return err
+		end
 
-    seen_hook = true -- allow to accept all commands
-    coro_debugger = coroutine.create(debugger_loop)
+		seen_hook = true -- allow to accept all commands
+		coro_debugger = coroutine.create(debugger_loop)
 
-    while true do
-      step_into = true -- start with step command
-      abort = false -- reset abort flag from the previous loop
-      if scratchpad then checkcount = mobdebug.checkcount end -- force suspend right away
+		while true do
+			step_into = true -- start with step command
+			abort = false -- reset abort flag from the previous loop
+			if scratchpad then checkcount = mobdebug.checkcount end -- force suspend right away
 
-      coro_debugee = coroutine.create(debugee)
-      debug.sethook(coro_debugee, debug_hook, "lcr")
-      local status, err = coroutine.resume(coro_debugee)
+			coro_debugee = coroutine.create(debugee)
+			debug.sethook(coro_debugee, debug_hook, "lcr")
+			local status, err = coroutine.resume(coro_debugee)
 
-      -- was there an error or is the script done?
-      -- 'abort' state is allowed here; ignore it
-      if abort then
-        if tostring(abort) == 'exit' then break end
-      else
-        if status then -- normal execution is done
-          break
-        elseif err and not tostring(err):find(deferror) then
-          -- report the error back
-          -- err is not necessarily a string, so convert to string to report
-          report(debug.traceback(coro_debugee), tostring(err))
-          if exitonerror then break end
-          -- resume once more to clear the response the debugger wants to send
-          -- need to use capture_vars(2) as three would be the level of
-          -- the caller for controller(), but because of the tail call,
-          -- the caller may not exist;
-          -- This is not entirely safe as the user may see the local
-          -- variable from console, but they will be reset anyway.
-          -- This functionality is used when scratchpad is paused to
-          -- gain access to remote console to modify global variables.
-          local status, err = coroutine.resume(coro_debugger, events.RESTART, capture_vars(2))
-          if not status or status and err == "exit" then break end
-        end
-      end
-    end
-  else
-    print(("Could not connect to %s:%s: %s")
-      :format(controller_host, controller_port, err or "unknown error"))
-    return false
-  end
-  return true
+			-- was there an error or is the script done?
+			-- 'abort' state is allowed here; ignore it
+			if abort then
+				if tostring(abort) == 'exit' then break end
+			else
+				if status then -- normal execution is done
+					break
+				elseif err and not tostring(err):find(deferror) then
+					-- report the error back
+					-- err is not necessarily a string, so convert to string to report
+					report(debug.traceback(coro_debugee), tostring(err))
+					if exitonerror then break end
+					-- resume once more to clear the response the debugger wants to send
+					-- need to use capture_vars(2) as three would be the level of
+					-- the caller for controller(), but because of the tail call,
+					-- the caller may not exist;
+					-- This is not entirely safe as the user may see the local
+					-- variable from console, but they will be reset anyway.
+					-- This functionality is used when scratchpad is paused to
+					-- gain access to remote console to modify global variables.
+					local status, err = coroutine.resume(coro_debugger, events.RESTART, capture_vars(2))
+					if not status or status and err == "exit" then break end
+				end
+			end
+		end
+	else
+		print(("Could not connect to %s:%s: %s")
+			:format(controller_host, controller_port, err or "unknown error"))
+		return false
+	end
+	return true
 end
 
 local function scratchpad(controller_host, controller_port)
-  return controller(controller_host, controller_port, true)
+	return controller(controller_host, controller_port, true)
 end
 
 local function loop(controller_host, controller_port)
-  return controller(controller_host, controller_port, false)
+	return controller(controller_host, controller_port, false)
 end
 
 local function on()
-  if not (isrunning() and server) then return end
+	if not (isrunning() and server) then return end
 
-  -- main is set to true under Lua5.2 for the "main" chunk.
-  -- Lua5.1 returns co as `nil` in that case.
-  local co, main = coroutine.running()
-  if main then co = nil end
-  if co then
-    coroutines[co] = true
-    debug.sethook(co, debug_hook, "lcr")
-  else
-    if jit then coroutines.main = true end
-    debug.sethook(debug_hook, "lcr")
-  end
+	-- main is set to true under Lua5.2 for the "main" chunk.
+	-- Lua5.1 returns co as `nil` in that case.
+	local co, main = coroutine.running()
+	if main then co = nil end
+	if co then
+		coroutines[co] = true
+		debug.sethook(co, debug_hook, "lcr")
+	else
+		if jit then coroutines.main = true end
+		debug.sethook(debug_hook, "lcr")
+	end
 end
 
 local function off()
-  if not (isrunning() and server) then return end
+	if not (isrunning() and server) then return end
 
-  -- main is set to true under Lua5.2 for the "main" chunk.
-  -- Lua5.1 returns co as `nil` in that case.
-  local co, main = coroutine.running()
-  if main then co = nil end
+	-- main is set to true under Lua5.2 for the "main" chunk.
+	-- Lua5.1 returns co as `nil` in that case.
+	local co, main = coroutine.running()
+	if main then co = nil end
 
-  -- don't remove coroutine hook under LuaJIT as there is only one (global) hook
-  if co then
-    coroutines[co] = false
-    if not jit then debug.sethook(co) end
-  else
-    if jit then coroutines.main = false end
-    if not jit then debug.sethook() end
-  end
+	-- don't remove coroutine hook under LuaJIT as there is only one (global) hook
+	if co then
+		coroutines[co] = false
+		if not jit then debug.sethook(co) end
+	else
+		if jit then coroutines.main = false end
+		if not jit then debug.sethook() end
+	end
 
-  -- check if there is any thread that is still being debugged under LuaJIT;
-  -- if not, turn the debugging off
-  if jit then
-    local remove = true
-    for co, debugged in pairs(coroutines) do
-      if debugged then remove = false; break end
-    end
-    if remove then debug.sethook() end
-  end
+	-- check if there is any thread that is still being debugged under LuaJIT;
+	-- if not, turn the debugging off
+	if jit then
+		local remove = true
+		for co, debugged in pairs(coroutines) do
+			if debugged then remove = false; break end
+		end
+		if remove then debug.sethook() end
+	end
 end
 
 -- Handles server debugging commands 
 local function handle(params, client, options)
-  local _, _, command = string.find(params, "^([a-z]+)")
-  local file, line, watch_idx
-  if command == "run" or command == "step" or command == "out"
-  or command == "over" or command == "exit" then
-    client:send(string.upper(command) .. "\n")
-    client:receive() -- this should consume the first '200 OK' response
-    while true do
-      local done = true
-      local breakpoint = client:receive()
-      if not breakpoint then
-        print("Program finished")
-        os.exit()
-        return -- use return here for those cases where os.exit() is not wanted
-      end
-      local _, _, status = string.find(breakpoint, "^(%d+)")
-      if status == "200" then
-        -- don't need to do anything
-      elseif status == "202" then
-        _, _, file, line = string.find(breakpoint, "^202 Paused%s+(.-)%s+(%d+)%s*$")
-        if file and line then
-          print("Paused at file " .. file .. " line " .. line)
-        end
-      elseif status == "203" then
-        _, _, file, line, watch_idx = string.find(breakpoint, "^203 Paused%s+(.-)%s+(%d+)%s+(%d+)%s*$")
-        if file and line and watch_idx then
-          print("Paused at file " .. file .. " line " .. line .. " (watch expression " .. watch_idx .. ": [" .. watches[watch_idx] .. "])")
-        end
-      elseif status == "204" then
-        local _, _, stream, size = string.find(breakpoint, "^204 Output (%w+) (%d+)$")
-        if stream and size then
-          local msg = client:receive(tonumber(size))
-          print(msg)
-          if outputs[stream] then outputs[stream](msg) end
-          -- this was just the output, so go back reading the response
-          done = false
-        end
-      elseif status == "401" then
-        local _, _, size = string.find(breakpoint, "^401 Error in Execution (%d+)$")
-        if size then
-          local msg = client:receive(tonumber(size))
-          print("Error in remote application: " .. msg)
-          os.exit(1)
-          return nil, nil, msg -- use return here for those cases where os.exit() is not wanted
-        end
-      else
-        print("Unknown error")
-        os.exit(1)
-        -- use return here for those cases where os.exit() is not wanted
-        return nil, nil, "Debugger error: unexpected response '" .. breakpoint .. "'"
-      end
-      if done then break end
-    end
-  elseif command == "setb" then
-    _, _, _, file, line = string.find(params, "^([a-z]+)%s+(.-)%s+(%d+)%s*$")
-    if file and line then
-      -- if this is a file name, and not a file source
-      if not file:find('^".*"$') then
-        file = string.gsub(file, "\\", "/") -- convert slash
-        file = removebasedir(file, basedir)
-      end
-      client:send("SETB " .. file .. " " .. line .. "\n")
-      if client:receive() == "200 OK" then
-        set_breakpoint(file, line)
-      else
-        print("Error: breakpoint not inserted")
-      end
-    else
-      print("Invalid command")
-    end
-  elseif command == "setw" then
-    local _, _, exp = string.find(params, "^[a-z]+%s+(.+)$")
-    if exp then
-      client:send("SETW " .. exp .. "\n")
-      local answer = client:receive()
-      local _, _, watch_idx = string.find(answer, "^200 OK (%d+)%s*$")
-      if watch_idx then
-        watches[watch_idx] = exp
-        print("Inserted watch exp no. " .. watch_idx)
-      else
-        local _, _, size = string.find(answer, "^401 Error in Expression (%d+)$")
-        if size then
-          local err = client:receive(tonumber(size)):gsub(".-:%d+:%s*","")
-          print("Error: watch expression not set: " .. err)
-        else
-          print("Error: watch expression not set")
-        end
-      end
-    else
-      print("Invalid command")
-    end
-  elseif command == "delb" then
-    _, _, _, file, line = string.find(params, "^([a-z]+)%s+(.-)%s+(%d+)%s*$")
-    if file and line then
-      -- if this is a file name, and not a file source
-      if not file:find('^".*"$') then
-        file = string.gsub(file, "\\", "/") -- convert slash
-        file = removebasedir(file, basedir)
-      end
-      client:send("DELB " .. file .. " " .. line .. "\n")
-      if client:receive() == "200 OK" then 
-        remove_breakpoint(file, line)
-      else
-        print("Error: breakpoint not removed")
-      end
-    else
-      print("Invalid command")
-    end
-  elseif command == "delallb" then
-    for line, breaks in pairs(breakpoints) do
-      for file, _ in pairs(breaks) do
-        client:send("DELB " .. file .. " " .. line .. "\n")
-        if client:receive() == "200 OK" then
-          remove_breakpoint(file, line)
-        else
-          print("Error: breakpoint at file " .. file .. " line " .. line .. " not removed")
-        end
-      end
-    end
-  elseif command == "delw" then
-    local _, _, index = string.find(params, "^[a-z]+%s+(%d+)%s*$")
-    if index then
-      client:send("DELW " .. index .. "\n")
-      if client:receive() == "200 OK" then 
-        watches[index] = nil
-      else
-        print("Error: watch expression not removed")
-      end
-    else
-      print("Invalid command")
-    end
-  elseif command == "delallw" then
-    for index, exp in pairs(watches) do
-      client:send("DELW " .. index .. "\n")
-      if client:receive() == "200 OK" then 
-        watches[index] = nil
-      else
-        print("Error: watch expression at index " .. index .. " [" .. exp .. "] not removed")
-      end
-    end    
-  elseif command == "eval" or command == "exec" 
-      or command == "load" or command == "loadstring"
-      or command == "reload" then
-    local _, _, exp = string.find(params, "^[a-z]+%s+(.+)$")
-    if exp or (command == "reload") then 
-      if command == "eval" or command == "exec" then
-        exp = (exp:gsub("%-%-%[(=*)%[.-%]%1%]", "") -- remove comments
-                  :gsub("%-%-.-\n", " ") -- remove line comments
-                  :gsub("\n", " ")) -- convert new lines
-        if command == "eval" then exp = "return " .. exp end
-        client:send("EXEC " .. exp .. "\n")
-      elseif command == "reload" then
-        client:send("LOAD 0 -\n")
-      elseif command == "loadstring" then
-        local _, _, _, file, lines = string.find(exp, "^([\"'])(.-)%1%s+(.+)")
-        if not file then
-           _, _, file, lines = string.find(exp, "^(%S+)%s+(.+)")
-        end
-        client:send("LOAD " .. #lines .. " " .. file .. "\n")
-        client:send(lines)
-      else
-        local file = io.open(exp, "r")
-        if not file and pcall(require, "winapi") then
-          -- if file is not open and winapi is there, try with a short path;
-          -- this may be needed for unicode paths on windows
-          winapi.set_encoding(winapi.CP_UTF8)
-          file = io.open(winapi.short_path(exp), "r")
-        end
-        if not file then error("Cannot open file " .. exp) end
-        -- read the file and remove the shebang line as it causes a compilation error
-        local lines = file:read("*all"):gsub("^#!.-\n", "\n")
-        file:close()
+	local _, _, command = string.find(params, "^([a-z]+)")
+	local file, line, watch_idx
+	if command == "run" or command == "step" or command == "out"
+	or command == "over" or command == "exit" then
+		client:send(string.upper(command) .. "\n")
+		client:receive() -- this should consume the first '200 OK' response
+		while true do
+			local done = true
+			local breakpoint = client:receive()
+			if not breakpoint then
+				print("Program finished")
+				os.exit()
+				return -- use return here for those cases where os.exit() is not wanted
+			end
+			local _, _, status = string.find(breakpoint, "^(%d+)")
+			if status == "200" then
+				-- don't need to do anything
+			elseif status == "202" then
+				_, _, file, line = string.find(breakpoint, "^202 Paused%s+(.-)%s+(%d+)%s*$")
+				if file and line then
+					print("Paused at file " .. file .. " line " .. line)
+				end
+			elseif status == "203" then
+				_, _, file, line, watch_idx = string.find(breakpoint, "^203 Paused%s+(.-)%s+(%d+)%s+(%d+)%s*$")
+				if file and line and watch_idx then
+					print("Paused at file " .. file .. " line " .. line .. " (watch expression " .. watch_idx .. ": [" .. watches[watch_idx] .. "])")
+				end
+			elseif status == "204" then
+				local _, _, stream, size = string.find(breakpoint, "^204 Output (%w+) (%d+)$")
+				if stream and size then
+					local msg = client:receive(tonumber(size))
+					print(msg)
+					if outputs[stream] then outputs[stream](msg) end
+					-- this was just the output, so go back reading the response
+					done = false
+				end
+			elseif status == "401" then
+				local _, _, size = string.find(breakpoint, "^401 Error in Execution (%d+)$")
+				if size then
+					local msg = client:receive(tonumber(size))
+					print("Error in remote application: " .. msg)
+					os.exit(1)
+					return nil, nil, msg -- use return here for those cases where os.exit() is not wanted
+				end
+			else
+				print("Unknown error")
+				os.exit(1)
+				-- use return here for those cases where os.exit() is not wanted
+				return nil, nil, "Debugger error: unexpected response '" .. breakpoint .. "'"
+			end
+			if done then break end
+		end
+	elseif command == "setb" then
+		_, _, _, file, line = string.find(params, "^([a-z]+)%s+(.-)%s+(%d+)%s*$")
+		if file and line then
+			-- if this is a file name, and not a file source
+			if not file:find('^".*"$') then
+				file = string.gsub(file, "\\", "/") -- convert slash
+				file = removebasedir(file, basedir)
+			end
+			client:send("SETB " .. file .. " " .. line .. "\n")
+			if client:receive() == "200 OK" then
+				set_breakpoint(file, line)
+			else
+				print("Error: breakpoint not inserted")
+			end
+		else
+			print("Invalid command")
+		end
+	elseif command == "setw" then
+		local _, _, exp = string.find(params, "^[a-z]+%s+(.+)$")
+		if exp then
+			client:send("SETW " .. exp .. "\n")
+			local answer = client:receive()
+			local _, _, watch_idx = string.find(answer, "^200 OK (%d+)%s*$")
+			if watch_idx then
+				watches[watch_idx] = exp
+				print("Inserted watch exp no. " .. watch_idx)
+			else
+				local _, _, size = string.find(answer, "^401 Error in Expression (%d+)$")
+				if size then
+					local err = client:receive(tonumber(size)):gsub(".-:%d+:%s*","")
+					print("Error: watch expression not set: " .. err)
+				else
+					print("Error: watch expression not set")
+				end
+			end
+		else
+			print("Invalid command")
+		end
+	elseif command == "delb" then
+		_, _, _, file, line = string.find(params, "^([a-z]+)%s+(.-)%s+(%d+)%s*$")
+		if file and line then
+			-- if this is a file name, and not a file source
+			if not file:find('^".*"$') then
+				file = string.gsub(file, "\\", "/") -- convert slash
+				file = removebasedir(file, basedir)
+			end
+			client:send("DELB " .. file .. " " .. line .. "\n")
+			if client:receive() == "200 OK" then 
+				remove_breakpoint(file, line)
+			else
+				print("Error: breakpoint not removed")
+			end
+		else
+			print("Invalid command")
+		end
+	elseif command == "delallb" then
+		for line, breaks in pairs(breakpoints) do
+			for file, _ in pairs(breaks) do
+				client:send("DELB " .. file .. " " .. line .. "\n")
+				if client:receive() == "200 OK" then
+					remove_breakpoint(file, line)
+				else
+					print("Error: breakpoint at file " .. file .. " line " .. line .. " not removed")
+				end
+			end
+		end
+	elseif command == "delw" then
+		local _, _, index = string.find(params, "^[a-z]+%s+(%d+)%s*$")
+		if index then
+			client:send("DELW " .. index .. "\n")
+			if client:receive() == "200 OK" then 
+				watches[index] = nil
+			else
+				print("Error: watch expression not removed")
+			end
+		else
+			print("Invalid command")
+		end
+	elseif command == "delallw" then
+		for index, exp in pairs(watches) do
+			client:send("DELW " .. index .. "\n")
+			if client:receive() == "200 OK" then 
+				watches[index] = nil
+			else
+				print("Error: watch expression at index " .. index .. " [" .. exp .. "] not removed")
+			end
+		end		 
+	elseif command == "eval" or command == "exec" 
+			or command == "load" or command == "loadstring"
+			or command == "reload" then
+		local _, _, exp = string.find(params, "^[a-z]+%s+(.+)$")
+		if exp or (command == "reload") then 
+			if command == "eval" or command == "exec" then
+				exp = (exp:gsub("%-%-%[(=*)%[.-%]%1%]", "") -- remove comments
+									:gsub("%-%-.-\n", " ") -- remove line comments
+									:gsub("\n", " ")) -- convert new lines
+				if command == "eval" then exp = "return " .. exp end
+				client:send("EXEC " .. exp .. "\n")
+			elseif command == "reload" then
+				client:send("LOAD 0 -\n")
+			elseif command == "loadstring" then
+				local _, _, _, file, lines = string.find(exp, "^([\"'])(.-)%1%s+(.+)")
+				if not file then
+					 _, _, file, lines = string.find(exp, "^(%S+)%s+(.+)")
+				end
+				client:send("LOAD " .. #lines .. " " .. file .. "\n")
+				client:send(lines)
+			else
+				local file = io.open(exp, "r")
+				if not file and pcall(require, "winapi") then
+					-- if file is not open and winapi is there, try with a short path;
+					-- this may be needed for unicode paths on windows
+					winapi.set_encoding(winapi.CP_UTF8)
+					file = io.open(winapi.short_path(exp), "r")
+				end
+				if not file then error("Cannot open file " .. exp) end
+				-- read the file and remove the shebang line as it causes a compilation error
+				local lines = file:read("*all"):gsub("^#!.-\n", "\n")
+				file:close()
 
-        local file = string.gsub(exp, "\\", "/") -- convert slash
-        file = removebasedir(file, basedir)
-        client:send("LOAD " .. #lines .. " " .. file .. "\n")
-        if #lines > 0 then client:send(lines) end
-      end
-      while true do
-        local params, err = client:receive()
-        if not params then
-          return nil, nil, "Debugger connection " .. (err or "error")
-        end
-        local done = true
-        local _, _, status, len = string.find(params, "^(%d+).-%s+(%d+)%s*$")
-        if status == "200" then
-          len = tonumber(len)
-          if len > 0 then
-            local status, res
-            local str = client:receive(len)
-            -- handle serialized table with results
-            local func, err = loadstring(str)
-            if func then
-              status, res = pcall(func)
-              if not status then err = res
-              elseif type(res) ~= "table" then
-                err = "received "..type(res).." instead of expected 'table'"
-              end
-            end
-            if err then
-              print("Error in processing results: " .. err)
-              return nil, nil, "Error in processing results: " .. err
-            end
-            print(unpack(res))
-            return res[1], res
-          end
-        elseif status == "201" then
-          _, _, file, line = string.find(params, "^201 Started%s+(.-)%s+(%d+)%s*$")
-        elseif status == "202" or params == "200 OK" then
-          -- do nothing; this only happens when RE/LOAD command gets the response
-          -- that was for the original command that was aborted
-        elseif status == "204" then
-          local _, _, stream, size = string.find(params, "^204 Output (%w+) (%d+)$")
-          if stream and size then
-            local msg = client:receive(tonumber(size))
-            print(msg)
-            if outputs[stream] then outputs[stream](msg) end
-            -- this was just the output, so go back reading the response
-            done = false
-          end
-        elseif status == "401" then
-          len = tonumber(len)
-          local res = client:receive(len)
-          print("Error in expression: " .. res)
-          return nil, nil, res
-        else
-          print("Unknown error")
-          return nil, nil, "Debugger error: unexpected response after EXEC/LOAD '" .. params .. "'"
-        end
-        if done then break end
-      end
-    else
-      print("Invalid command")
-    end
-  elseif command == "listb" then
-    for l, v in pairs(breakpoints) do
-      for f in pairs(v) do
-        print(f .. ": " .. l)
-      end
-    end
-  elseif command == "listw" then
-    for i, v in pairs(watches) do
-      print("Watch exp. " .. i .. ": " .. v)
-    end    
-  elseif command == "suspend" then
-    client:send("SUSPEND\n")
-  elseif command == "stack" then
-    client:send("STACK\n")
-    local resp = client:receive()
-    local _, _, status, res = string.find(resp, "^(%d+)%s+%w+%s+(.+)%s*$")
-    if status == "200" then
-      local func, err = loadstring(res)
-      if func == nil then
-        print("Error in stack information: " .. err)
-        return nil, nil, err
-      end
-      local ok, stack = pcall(func)
-      if not ok then
-        print("Error in stack information: " .. stack)
-        return nil, nil, stack
-      end
-      for _,frame in ipairs(stack) do
-        print(serpent.line(frame[1], {comment = false}))
-      end
-      return stack
-    elseif status == "401" then
-      local _, _, len = string.find(resp, "%s+(%d+)%s*$")
-      len = tonumber(len)
-      local res = len > 0 and client:receive(len) or "Invalid stack information."
-      print("Error in expression: " .. res)
-      return nil, nil, res
-    else
-      print("Unknown error")
-      return nil, nil, "Debugger error: unexpected response after STACK"
-    end
-  elseif command == "output" then
-    local _, _, stream, mode = string.find(params, "^[a-z]+%s+(%w+)%s+([dcr])%s*$")
-    if stream and mode then
-      client:send("OUTPUT "..stream.." "..mode.."\n")
-      local resp = client:receive()
-      local _, _, status = string.find(resp, "^(%d+)%s+%w+%s*$")
-      if status == "200" then
-        print("Stream "..stream.." redirected")
-        outputs[stream] = type(options) == 'table' and options.handler or nil
-      else
-        print("Unknown error")
-        return nil, nil, "Debugger error: can't redirect "..stream
-      end
-    else
-      print("Invalid command")
-    end
-  elseif command == "basedir" then
-    local _, _, dir = string.find(params, "^[a-z]+%s+(.+)$")
-    if dir then
-      dir = string.gsub(dir, "\\", "/") -- convert slash
-      if not string.find(dir, "/$") then dir = dir .. "/" end
+				local file = string.gsub(exp, "\\", "/") -- convert slash
+				file = removebasedir(file, basedir)
+				client:send("LOAD " .. #lines .. " " .. file .. "\n")
+				if #lines > 0 then client:send(lines) end
+			end
+			while true do
+				local params, err = client:receive()
+				if not params then
+					return nil, nil, "Debugger connection " .. (err or "error")
+				end
+				local done = true
+				local _, _, status, len = string.find(params, "^(%d+).-%s+(%d+)%s*$")
+				if status == "200" then
+					len = tonumber(len)
+					if len > 0 then
+						local status, res
+						local str = client:receive(len)
+						-- handle serialized table with results
+						local func, err = loadstring(str)
+						if func then
+							status, res = pcall(func)
+							if not status then err = res
+							elseif type(res) ~= "table" then
+								err = "received "..type(res).." instead of expected 'table'"
+							end
+						end
+						if err then
+							print("Error in processing results: " .. err)
+							return nil, nil, "Error in processing results: " .. err
+						end
+						print(unpack(res))
+						return res[1], res
+					end
+				elseif status == "201" then
+					_, _, file, line = string.find(params, "^201 Started%s+(.-)%s+(%d+)%s*$")
+				elseif status == "202" or params == "200 OK" then
+					-- do nothing; this only happens when RE/LOAD command gets the response
+					-- that was for the original command that was aborted
+				elseif status == "204" then
+					local _, _, stream, size = string.find(params, "^204 Output (%w+) (%d+)$")
+					if stream and size then
+						local msg = client:receive(tonumber(size))
+						print(msg)
+						if outputs[stream] then outputs[stream](msg) end
+						-- this was just the output, so go back reading the response
+						done = false
+					end
+				elseif status == "401" then
+					len = tonumber(len)
+					local res = client:receive(len)
+					print("Error in expression: " .. res)
+					return nil, nil, res
+				else
+					print("Unknown error")
+					return nil, nil, "Debugger error: unexpected response after EXEC/LOAD '" .. params .. "'"
+				end
+				if done then break end
+			end
+		else
+			print("Invalid command")
+		end
+	elseif command == "listb" then
+		for l, v in pairs(breakpoints) do
+			for f in pairs(v) do
+				print(f .. ": " .. l)
+			end
+		end
+	elseif command == "listw" then
+		for i, v in pairs(watches) do
+			print("Watch exp. " .. i .. ": " .. v)
+		end		 
+	elseif command == "suspend" then
+		client:send("SUSPEND\n")
+	elseif command == "stack" then
+		client:send("STACK\n")
+		local resp = client:receive()
+		local _, _, status, res = string.find(resp, "^(%d+)%s+%w+%s+(.+)%s*$")
+		if status == "200" then
+			local func, err = loadstring(res)
+			if func == nil then
+				print("Error in stack information: " .. err)
+				return nil, nil, err
+			end
+			local ok, stack = pcall(func)
+			if not ok then
+				print("Error in stack information: " .. stack)
+				return nil, nil, stack
+			end
+			for _,frame in ipairs(stack) do
+				print(serpent.line(frame[1], {comment = false}))
+			end
+			return stack
+		elseif status == "401" then
+			local _, _, len = string.find(resp, "%s+(%d+)%s*$")
+			len = tonumber(len)
+			local res = len > 0 and client:receive(len) or "Invalid stack information."
+			print("Error in expression: " .. res)
+			return nil, nil, res
+		else
+			print("Unknown error")
+			return nil, nil, "Debugger error: unexpected response after STACK"
+		end
+	elseif command == "output" then
+		local _, _, stream, mode = string.find(params, "^[a-z]+%s+(%w+)%s+([dcr])%s*$")
+		if stream and mode then
+			client:send("OUTPUT "..stream.." "..mode.."\n")
+			local resp = client:receive()
+			local _, _, status = string.find(resp, "^(%d+)%s+%w+%s*$")
+			if status == "200" then
+				print("Stream "..stream.." redirected")
+				outputs[stream] = type(options) == 'table' and options.handler or nil
+			else
+				print("Unknown error")
+				return nil, nil, "Debugger error: can't redirect "..stream
+			end
+		else
+			print("Invalid command")
+		end
+	elseif command == "basedir" then
+		local _, _, dir = string.find(params, "^[a-z]+%s+(.+)$")
+		if dir then
+			dir = string.gsub(dir, "\\", "/") -- convert slash
+			if not string.find(dir, "/$") then dir = dir .. "/" end
 
-      local remdir = dir:match("\t(.+)")
-      if remdir then dir = dir:gsub("/?\t.+", "/") end
-      basedir = dir
+			local remdir = dir:match("\t(.+)")
+			if remdir then dir = dir:gsub("/?\t.+", "/") end
+			basedir = dir
 
-      client:send("BASEDIR "..(remdir or dir).."\n")
-      local resp = client:receive()
-      local _, _, status = string.find(resp, "^(%d+)%s+%w+%s*$")
-      if status == "200" then
-        print("New base directory is " .. basedir)
-      else
-        print("Unknown error")
-        return nil, nil, "Debugger error: unexpected response after BASEDIR"
-      end
-    else
-      print(basedir)
-    end
-  elseif command == "help" then
-    print("setb <file> <line>    -- sets a breakpoint")
-    print("delb <file> <line>    -- removes a breakpoint")
-    print("delallb               -- removes all breakpoints")
-    print("setw <exp>            -- adds a new watch expression")
-    print("delw <index>          -- removes the watch expression at index")
-    print("delallw               -- removes all watch expressions")
-    print("run                   -- runs until next breakpoint")
-    print("step                  -- runs until next line, stepping into function calls")
-    print("over                  -- runs until next line, stepping over function calls")
-    print("out                   -- runs until line after returning from current function")
-    print("listb                 -- lists breakpoints")
-    print("listw                 -- lists watch expressions")
-    print("eval <exp>            -- evaluates expression on the current context and returns its value")
-    print("exec <stmt>           -- executes statement on the current context")
-    print("load <file>           -- loads a local file for debugging")
-    print("reload                -- restarts the current debugging session")
-    print("stack                 -- reports stack trace")
-    print("output stdout <d|c|r> -- capture and redirect io stream (default|copy|redirect)")
-    print("basedir [<path>]      -- sets the base path of the remote application, or shows the current one")
-    print("exit                  -- exits debugger")
-  else
-    local _, _, spaces = string.find(params, "^(%s*)$")
-    if not spaces then
-      print("Invalid command")
-      return nil, nil, "Invalid command"
-    end
-  end
-  return file, line
+			client:send("BASEDIR "..(remdir or dir).."\n")
+			local resp = client:receive()
+			local _, _, status = string.find(resp, "^(%d+)%s+%w+%s*$")
+			if status == "200" then
+				print("New base directory is " .. basedir)
+			else
+				print("Unknown error")
+				return nil, nil, "Debugger error: unexpected response after BASEDIR"
+			end
+		else
+			print(basedir)
+		end
+	elseif command == "help" then
+		print("setb <file> <line>		 -- sets a breakpoint")
+		print("delb <file> <line>		 -- removes a breakpoint")
+		print("delallb							 -- removes all breakpoints")
+		print("setw <exp>						 -- adds a new watch expression")
+		print("delw <index>					 -- removes the watch expression at index")
+		print("delallw							 -- removes all watch expressions")
+		print("run									 -- runs until next breakpoint")
+		print("step									 -- runs until next line, stepping into function calls")
+		print("over									 -- runs until next line, stepping over function calls")
+		print("out									 -- runs until line after returning from current function")
+		print("listb								 -- lists breakpoints")
+		print("listw								 -- lists watch expressions")
+		print("eval <exp>						 -- evaluates expression on the current context and returns its value")
+		print("exec <stmt>					 -- executes statement on the current context")
+		print("load <file>					 -- loads a local file for debugging")
+		print("reload								 -- restarts the current debugging session")
+		print("stack								 -- reports stack trace")
+		print("output stdout <d|c|r> -- capture and redirect io stream (default|copy|redirect)")
+		print("basedir [<path>]			 -- sets the base path of the remote application, or shows the current one")
+		print("exit									 -- exits debugger")
+	else
+		local _, _, spaces = string.find(params, "^(%s*)$")
+		if not spaces then
+			print("Invalid command")
+			return nil, nil, "Invalid command"
+		end
+	end
+	return file, line
 end
 
 -- Starts debugging server
 local function listen(host, port)
-  host = host or "*"
-  port = port or mobdebug.port
+	host = host or "*"
+	port = port or mobdebug.port
 
-  local socket = require "socket"
+	local socket = require "socket"
 
-  print("Lua Remote Debugger")
-  print("Run the program you wish to debug")
+	print("Lua Remote Debugger")
+	print("Run the program you wish to debug")
 
-  local server = socket.bind(host, port)
-  local client = server:accept()
+	local server = socket.bind(host, port)
+	local client = server:accept()
 
-  client:send("STEP\n")
-  client:receive()
+	client:send("STEP\n")
+	client:receive()
 
-  local breakpoint = client:receive()
-  local _, _, file, line = string.find(breakpoint, "^202 Paused%s+(.-)%s+(%d+)%s*$")
-  if file and line then
-    print("Paused at file " .. file )
-    print("Type 'help' for commands")
-  else
-    local _, _, size = string.find(breakpoint, "^401 Error in Execution (%d+)%s*$")
-    if size then
-      print("Error in remote application: ")
-      print(client:receive(size))
-    end
-  end
+	local breakpoint = client:receive()
+	local _, _, file, line = string.find(breakpoint, "^202 Paused%s+(.-)%s+(%d+)%s*$")
+	if file and line then
+		print("Paused at file " .. file )
+		print("Type 'help' for commands")
+	else
+		local _, _, size = string.find(breakpoint, "^401 Error in Execution (%d+)%s*$")
+		if size then
+			print("Error in remote application: ")
+			print(client:receive(size))
+		end
+	end
 
-  while true do
-    io.write("> ")
-    local line = io.read("*line")
-    handle(line, client)
-  end
+	while true do
+		io.write("> ")
+		local line = io.read("*line")
+		handle(line, client)
+	end
 end
 
 local cocreate
 local function coro()
-  if cocreate then return end -- only set once
-  cocreate = cocreate or coroutine.create
-  coroutine.create = function(f, ...)
-    return cocreate(function(...)
-      require("mobdebug").on()
-      return f(...)
-    end, ...)
-  end
+	if cocreate then return end -- only set once
+	cocreate = cocreate or coroutine.create
+	coroutine.create = function(f, ...)
+		return cocreate(function(...)
+			require("mobdebug").on()
+			return f(...)
+		end, ...)
+	end
 end
 
 local moconew
 local function moai()
-  if moconew then return end -- only set once
-  moconew = moconew or (MOAICoroutine and MOAICoroutine.new)
-  if not moconew then return end
-  MOAICoroutine.new = function(...)
-    local thread = moconew(...)
-    -- need to support both thread.run and getmetatable(thread).run, which
-    -- was used in earlier MOAI versions
-    local mt = thread.run and thread or getmetatable(thread)
-    local patched = mt.run
-    mt.run = function(self, f, ...)
-      return patched(self,  function(...)
-        require("mobdebug").on()
-        return f(...)
-      end, ...)
-    end
-    return thread
-  end
+	if moconew then return end -- only set once
+	moconew = moconew or (MOAICoroutine and MOAICoroutine.new)
+	if not moconew then return end
+	MOAICoroutine.new = function(...)
+		local thread = moconew(...)
+		-- need to support both thread.run and getmetatable(thread).run, which
+		-- was used in earlier MOAI versions
+		local mt = thread.run and thread or getmetatable(thread)
+		local patched = mt.run
+		mt.run = function(self, f, ...)
+			return patched(self,	function(...)
+				require("mobdebug").on()
+				return f(...)
+			end, ...)
+		end
+		return thread
+	end
 end
 
 -- this is a function that removes all hooks and closes the socket to
 -- report back to the controller that the debugging is done.
 -- the script that called `done` can still continue.
 local function done()
-  if not (isrunning() and server) then return end
+	if not (isrunning() and server) then return end
 
-  if not jit then
-    for co, debugged in pairs(coroutines) do
-      if debugged then debug.sethook(co) end
-    end
-  end
+	if not jit then
+		for co, debugged in pairs(coroutines) do
+			if debugged then debug.sethook(co) end
+		end
+	end
 
-  debug.sethook()
-  server:close()
+	debug.sethook()
+	server:close()
 
-  coro_debugger = nil -- to make sure isrunning() returns `false`
-  seen_hook = nil -- to make sure that the next start() call works
-  abort = nil -- to make sure that callback calls use proper "abort" value
+	coro_debugger = nil -- to make sure isrunning() returns `false`
+	seen_hook = nil -- to make sure that the next start() call works
+	abort = nil -- to make sure that callback calls use proper "abort" value
 end
 
 -- make public functions available
diff --git a/spine-corona/spine-corona/spine.lua b/spine-corona/spine-corona/spine.lua
index 9bfff5e21..6ecfd0989 100644
--- a/spine-corona/spine-corona/spine.lua
+++ b/spine-corona/spine-corona/spine.lua
@@ -71,7 +71,7 @@ spine.utils.readFile = function (fileName, base)
 	io.close(file)
 	return contents
 end
- 
+
 local json = require "json"
 spine.utils.readJSON = function (text)
 	return json.decode(text)
@@ -111,15 +111,15 @@ end
 function spine.Skeleton:updateWorldTransform()
 	spine.Skeleton.updateWorldTransform_super(self)
 	local premultipliedAlpha = self.premultipliedAlpha
-	
+
 	self.batches = 0
-	
+
 	-- Remove old drawing group, we will start anew
 	if self.drawingGroup then self.drawingGroup:removeSelf() end
 	local drawingGroup = display.newGroup()
 	self.drawingGroup = drawingGroup
 	self.group:insert(drawingGroup)
-	
+
 	local drawOrder = self.drawOrder
 	local currentGroup = nil
 	local groupVertices = {}
@@ -149,12 +149,12 @@ function spine.Skeleton:updateWorldTransform()
 				color = { vertices[5], vertices[6], vertices[7], vertices[8] }
 				blendMode = toCoronaBlendMode(slot.data.blendMode)
 			end
-			
+
 			if texture and vertices and indices then
 				if not lastTexture then lastTexture = texture end
 				if not lastColor then lastColor = color end
 				if not lastBlendMode then lastBlendMode = blendMode end
-				
+
 				if (texture ~= lastTexture or not colorEquals(color, lastColor) or blendMode ~= lastBlendMode) then
 					self:flush(groupVertices, groupUvs, groupIndices, lastTexture, lastColor, lastBlendMode, drawingGroup)
 					lastTexture = texture
@@ -164,12 +164,12 @@ function spine.Skeleton:updateWorldTransform()
 					groupUvs = {}
 					groupIndices = {}
 				end
-			
+
 				self:batch(vertices, indices, groupVertices, groupUvs, groupIndices)
 			end
 		end
 	end
-	
+
 	if #groupVertices > 0 then
 		self:flush(groupVertices, groupUvs, groupIndices, texture, color, blendMode, drawingGroup)
 	end
@@ -202,7 +202,7 @@ function spine.Skeleton:batch(vertices, indices, groupVertices, groupUvs, groupI
 		indexStart = indexStart + 1
 		i = i + 1
 	end
-	
+
 	i = 1
 	local numVertices = #vertices
 	local vertexStart = #groupVertices + 1
diff --git a/spine-csharp/src/Animation.cs b/spine-csharp/src/Animation.cs
index dc9315b8e..97b3339c5 100644
--- a/spine-csharp/src/Animation.cs
+++ b/spine-csharp/src/Animation.cs
@@ -661,7 +661,7 @@ namespace Spine {
 			: base(frameCount) {
 			frames = new float[frameCount * ENTRIES];
 		}
-			
+
 		/// <summary>Sets the time, mix and bend direction of the specified keyframe.</summary>
 		public void SetFrame (int frameIndex, float time, float mix, int bendDirection) {
 			frameIndex *= ENTRIES;
@@ -836,7 +836,7 @@ namespace Spine {
 		public PathConstraintMixTimeline (int frameCount)
 			: base(frameCount) {
 			frames = new float[frameCount * ENTRIES];
-		}			
+		}
 
 		/** Sets the time and mixes of the specified keyframe. */
 		public void SetFrame (int frameIndex, float time, float rotateMix, float translateMix) {
diff --git a/spine-csharp/src/Attachments/AtlasAttachmentLoader.cs b/spine-csharp/src/Attachments/AtlasAttachmentLoader.cs
index bc1e94ca2..76d9e2270 100644
--- a/spine-csharp/src/Attachments/AtlasAttachmentLoader.cs
+++ b/spine-csharp/src/Attachments/AtlasAttachmentLoader.cs
@@ -71,7 +71,7 @@ namespace Spine {
 			attachment.regionOriginalWidth = region.originalWidth;
 			attachment.regionOriginalHeight = region.originalHeight;
 			return attachment;
-		}			
+		}
 
 		public BoundingBoxAttachment NewBoundingBoxAttachment (Skin skin, String name) {
 			return new BoundingBoxAttachment(name);
diff --git a/spine-csharp/src/Attachments/PathAttachment.cs b/spine-csharp/src/Attachments/PathAttachment.cs
index 3a4d9db87..fa5890679 100644
--- a/spine-csharp/src/Attachments/PathAttachment.cs
+++ b/spine-csharp/src/Attachments/PathAttachment.cs
@@ -43,6 +43,6 @@ namespace Spine {
 
 		public PathAttachment (String name)
 			: base(name) {
-		}			
+		}
 	}
 }
diff --git a/spine-csharp/src/Attachments/RegionAttachment.cs b/spine-csharp/src/Attachments/RegionAttachment.cs
index 70cf57576..c6c29e0d8 100644
--- a/spine-csharp/src/Attachments/RegionAttachment.cs
+++ b/spine-csharp/src/Attachments/RegionAttachment.cs
@@ -136,7 +136,7 @@ namespace Spine {
 
 		public void ComputeWorldVertices (Bone bone, float[] worldVertices) {
 			Skeleton skeleton = bone.skeleton;
-			float x = skeleton.x + bone.worldX, y = skeleton.y + bone.worldY;			
+			float x = skeleton.x + bone.worldX, y = skeleton.y + bone.worldY;
 			float a = bone.a, b = bone.b, c = bone.c, d = bone.d;
 			float[] offset = this.offset;
 			worldVertices[X1] = offset[X1] * a + offset[Y1] * b + x;
diff --git a/spine-csharp/src/Attachments/VertexAttachment.cs b/spine-csharp/src/Attachments/VertexAttachment.cs
index 1f3e87e8b..b9df01ab2 100644
--- a/spine-csharp/src/Attachments/VertexAttachment.cs
+++ b/spine-csharp/src/Attachments/VertexAttachment.cs
@@ -112,6 +112,6 @@ namespace Spine {
 		/// <summary>Returns true if a deform originally applied to the specified attachment should be applied to this attachment.</summary>
 		virtual public bool ApplyDeform (VertexAttachment sourceAttachment) {
 			return this == sourceAttachment;
-		}			
+		}
 	}
 }
diff --git a/spine-csharp/src/Bone.cs b/spine-csharp/src/Bone.cs
index 203c28d69..a155bb153 100644
--- a/spine-csharp/src/Bone.cs
+++ b/spine-csharp/src/Bone.cs
@@ -294,7 +294,7 @@ namespace Spine {
 			appliedRotation = rotation;
 		}
 
-		public void WorldToLocal (float worldX, float worldY, out float localX, out float localY) {			
+		public void WorldToLocal (float worldX, float worldY, out float localX, out float localY) {
 			float a = this.a, b = this.b, c = this.c, d = this.d;
 			float invDet = 1 / (a * d - b * c);
 			float x = worldX - this.worldX, y = worldY - this.worldY;
diff --git a/spine-csharp/src/Json.cs b/spine-csharp/src/Json.cs
index 9a2e1e72f..73fbed789 100644
--- a/spine-csharp/src/Json.cs
+++ b/spine-csharp/src/Json.cs
@@ -54,7 +54,7 @@ namespace Spine {
  *
  * Changes made:
  * 
- * 	- Optimized parser speed (deserialize roughly near 3x faster than original)
+ *  - Optimized parser speed (deserialize roughly near 3x faster than original)
  *  - Added support to handle lexer/parser error messages with line numbers
  *  - Added more fine grained control over type conversions during the parsing
  *  - Refactory API (Separate Lexer code from Parser code and the Encoder from Decoder)
@@ -133,19 +133,19 @@ namespace SharpJson
 		{
 			int idx = 0;
 			StringBuilder builder = null;
-			
+
 			SkipWhiteSpaces();
-			
+
 			// "
 			char c = json[index++];
-			
+
 			bool failed = false;
 			bool complete = false;
-			
+
 			while (!complete && !failed) {
 				if (index == json.Length)
 					break;
-				
+
 				c = json[index++];
 				if (c == '"') {
 					complete = true;
@@ -153,9 +153,9 @@ namespace SharpJson
 				} else if (c == '\\') {
 					if (index == json.Length)
 						break;
-					
+
 					c = json[index++];
-					
+
 					switch (c) {
 					case '"':
 						stringBuffer[idx++] = '"';
@@ -185,10 +185,10 @@ namespace SharpJson
 						int remainingLength = json.Length - index;
 						if (remainingLength >= 4) {
 							var hex = new string(json, index, 4);
-							
+
 							// XXX: handle UTF
 							stringBuffer[idx++] = (char) Convert.ToInt32(hex, 16);
-							
+
 							// skip 4 chars
 							index += 4;
 						} else {
@@ -199,38 +199,38 @@ namespace SharpJson
 				} else {
 					stringBuffer[idx++] = c;
 				}
-				
+
 				if (idx >= stringBuffer.Length) {
 					if (builder == null)
 						builder = new StringBuilder();
-					
+
 					builder.Append(stringBuffer, 0, idx);
 					idx = 0;
 				}
 			}
-			
+
 			if (!complete) {
 				success = false;
 				return null;
 			}
-			
+
 			if (builder != null)
 				return builder.ToString ();
 			else
 				return new string (stringBuffer, 0, idx);
 		}
-		
+
 		string GetNumberString()
 		{
 			SkipWhiteSpaces();
 
 			int lastIndex = GetLastIndexOfNumber(index);
 			int charLength = (lastIndex - index) + 1;
-			
+
 			var result = new string (json, index, charLength);
-			
+
 			index = lastIndex + 1;
-			
+
 			return result;
 		}
 
@@ -238,10 +238,10 @@ namespace SharpJson
 		{
 			float number;
 			var str = GetNumberString ();
-			
+
 			if (!float.TryParse (str, NumberStyles.Float, CultureInfo.InvariantCulture, out number))
 				return 0;
-			
+
 			return number;
 		}
 
@@ -249,25 +249,24 @@ namespace SharpJson
 		{
 			double number;
 			var str = GetNumberString ();
-			
+
 			if (!double.TryParse(str, NumberStyles.Any, CultureInfo.InvariantCulture, out number))
 				return 0;
-			
+
 			return number;
 		}
-		
+
 		int GetLastIndexOfNumber(int index)
 		{
 			int lastIndex;
-			
+
 			for (lastIndex = index; lastIndex < json.Length; lastIndex++) {
 				char ch = json[lastIndex];
-				
-				if ((ch < '0' || ch > '9') && ch != '+' && ch != '-'
-				    && ch != '.' && ch != 'e' && ch != 'E')
+
+				if ((ch < '0' || ch > '9') && ch != '+' && ch != '-' && ch != '.' && ch != 'e' && ch != 'E')
 					break;
 			}
-			
+
 			return lastIndex - 1;
 		}
 
@@ -302,9 +301,9 @@ namespace SharpJson
 		{
 			if (index == json.Length)
 				return Token.None;
-			
+
 			char c = json[index++];
-			
+
 			switch (c) {
 			case '{':
 				return Token.CurlyOpen;
@@ -327,38 +326,41 @@ namespace SharpJson
 			}
 
 			index--;
-			
+
 			int remainingLength = json.Length - index;
-			
+
 			// false
 			if (remainingLength >= 5) {
 				if (json[index] == 'f' &&
-				    json[index + 1] == 'a' &&
-				    json[index + 2] == 'l' &&
-				    json[index + 3] == 's' &&
-				    json[index + 4] == 'e') {
+					json[index + 1] == 'a' &&
+					json[index + 2] == 'l' &&
+					json[index + 3] == 's' &&
+					json[index + 4] == 'e'
+				) {
 					index += 5;
 					return Token.False;
 				}
 			}
-			
+
 			// true
 			if (remainingLength >= 4) {
 				if (json[index] == 't' &&
-				    json[index + 1] == 'r' &&
-				    json[index + 2] == 'u' &&
-				    json[index + 3] == 'e') {
+					json[index + 1] == 'r' &&
+					json[index + 2] == 'u' &&
+					json[index + 3] == 'e'
+				) {
 					index += 4;
 					return Token.True;
 				}
 			}
-			
+
 			// null
 			if (remainingLength >= 4) {
 				if (json[index] == 'n' &&
-				    json[index + 1] == 'u' &&
-				    json[index + 2] == 'l' &&
-				    json[index + 3] == 'l') {
+					json[index + 1] == 'u' &&
+					json[index + 2] == 'l' &&
+					json[index + 3] == 'l'
+				) {
 					index += 4;
 					return Token.Null;
 				}
@@ -438,25 +440,25 @@ namespace SharpJson
 						TriggerError("Invalid token; expected ':'");
 						return null;
 					}
-					
+
 					// value
 					object value = ParseValue();
 
 					if (errorMessage != null)
 						return null;
-					
+
 					table[name] = value;
 					break;
 				}
 			}
-			
+
 			//return null; // Unreachable code
 		}
 
 		IList<object> ParseArray()
 		{
 			var array = new List<object>();
-			
+
 			// [
 			lexer.NextToken();
 
@@ -483,7 +485,7 @@ namespace SharpJson
 					break;
 				}
 			}
-			
+
 			//return null; // Unreachable code
 		}
 
diff --git a/spine-csharp/src/MathUtils.cs b/spine-csharp/src/MathUtils.cs
index 8a64c3a5e..78f761677 100644
--- a/spine-csharp/src/MathUtils.cs
+++ b/spine-csharp/src/MathUtils.cs
@@ -62,12 +62,12 @@ namespace Spine {
 		static public float Cos (float radians) {
 			return sin[(int)((radians + PI / 2) * radToIndex) & SIN_MASK];
 		}
-			
+
 		/// <summary>Returns the sine in radians from a lookup table.</summary>
 		static public float SinDeg (float degrees) {
 			return sin[(int)(degrees * degToIndex) & SIN_MASK];
 		}
-			
+
 		/// <summary>Returns the cosine in radians from a lookup table.</summary>
 		static public float CosDeg (float degrees) {
 			return sin[(int)((degrees + 90) * degToIndex) & SIN_MASK];
diff --git a/spine-csharp/src/PathConstraint.cs b/spine-csharp/src/PathConstraint.cs
index 3c0262b06..5fd2208cc 100644
--- a/spine-csharp/src/PathConstraint.cs
+++ b/spine-csharp/src/PathConstraint.cs
@@ -68,7 +68,7 @@ namespace Spine {
 		public void Apply () {
 			Update();
 		}
-			
+
 		public void Update () {
 			PathAttachment attachment = target.Attachment as PathAttachment;
 			if (attachment == null) return;
diff --git a/spine-csharp/src/PathConstraintData.cs b/spine-csharp/src/PathConstraintData.cs
index 20d5f5b09..72c8f4723 100644
--- a/spine-csharp/src/PathConstraintData.cs
+++ b/spine-csharp/src/PathConstraintData.cs
@@ -42,7 +42,7 @@ namespace Spine {
 		internal float position, spacing, rotateMix, translateMix;
 
 		public ExposedList<BoneData> Bones { get { return bones; } }
-		public SlotData Target { get { return target; } set { target = value; } }			
+		public SlotData Target { get { return target; } set { target = value; } }
 		public PositionMode PositionMode { get { return positionMode; } set { positionMode = value; } }
 		public SpacingMode SpacingMode { get { return spacingMode; } set { spacingMode = value; } }
 		public RotateMode RotateMode { get { return rotateMode; } set { rotateMode = value; } }
@@ -58,9 +58,9 @@ namespace Spine {
 			this.name = name;
 		}
 	}
-	
+
 	public enum PositionMode {
-		Fixed, Percent        
+		Fixed, Percent
 	}
 
 	public enum SpacingMode {
diff --git a/spine-csharp/src/Skeleton.cs b/spine-csharp/src/Skeleton.cs
index 4ba922287..c8316ab65 100644
--- a/spine-csharp/src/Skeleton.cs
+++ b/spine-csharp/src/Skeleton.cs
@@ -78,7 +78,7 @@ namespace Spine {
 			foreach (BoneData boneData in data.bones) {
 				Bone bone;
 				if (boneData.parent == null) {
-					bone = new Bone(boneData, this, null);				
+					bone = new Bone(boneData, this, null);
 				} else {
 					Bone parent = bones.Items[boneData.parent.index];
 					bone = new Bone(boneData, this, parent);
@@ -416,7 +416,7 @@ namespace Spine {
 			}
 			throw new Exception("Slot not found: " + slotName);
 		}
-			
+
 		/// <returns>May be null.</returns>
 		public IkConstraint FindIkConstraint (String constraintName) {
 			if (constraintName == null) throw new ArgumentNullException("constraintName", "constraintName cannot be null.");
diff --git a/spine-csharp/src/SkeletonBinary.cs b/spine-csharp/src/SkeletonBinary.cs
index b642bf164..6dab99d75 100644
--- a/spine-csharp/src/SkeletonBinary.cs
+++ b/spine-csharp/src/SkeletonBinary.cs
@@ -74,7 +74,7 @@ namespace Spine {
 			this.attachmentLoader = attachmentLoader;
 			Scale = 1;
 		}
-			
+
 		#if !ISUNITY && WINDOWS_STOREAPP
 		private async Task<SkeletonData> ReadFile(string path) {
 			var folder = Windows.ApplicationModel.Package.Current.InstalledLocation;
@@ -127,7 +127,7 @@ namespace Spine {
 				String name = ReadString(input);
 				BoneData parent = i == 0 ? null : skeletonData.bones.Items[ReadVarint(input, true)];
 				BoneData data = new BoneData(i, name, parent);
-				data.rotation = ReadFloat(input);		
+				data.rotation = ReadFloat(input);
 				data.x = ReadFloat(input) * scale;
 				data.y = ReadFloat(input) * scale;
 				data.scaleX = ReadFloat(input);
@@ -171,7 +171,7 @@ namespace Spine {
 			for (int i = 0, n = ReadVarint(input, true); i < n; i++) {
 				TransformConstraintData data = new TransformConstraintData(ReadString(input));
 				for (int ii = 0, nn = ReadVarint(input, true); ii < nn; ii++)
-				    data.bones.Add(skeletonData.bones.Items[ReadVarint(input, true)]);
+					data.bones.Add(skeletonData.bones.Items[ReadVarint(input, true)]);
 				data.target = skeletonData.bones.Items[ReadVarint(input, true)];
 				data.offsetRotation = ReadFloat(input);
 				data.offsetX = ReadFloat(input) * scale;
@@ -277,7 +277,7 @@ namespace Spine {
 			switch (type) {
 			case AttachmentType.Region: {
 					String path = ReadString(input);
-					float rotation = ReadFloat(input);		
+					float rotation = ReadFloat(input);
 					float x = ReadFloat(input);
 					float y = ReadFloat(input);
 					float scaleX = ReadFloat(input);
@@ -308,18 +308,18 @@ namespace Spine {
 					int vertexCount = ReadVarint(input, true);
 					Vertices vertices = ReadVertices(input, vertexCount);
 					if (nonessential) ReadInt(input); //int color = nonessential ? ReadInt(input) : 0; // Avoid unused local warning.
-					
+
 					BoundingBoxAttachment box = attachmentLoader.NewBoundingBoxAttachment(skin, name);
 					if (box == null) return null;
 					box.worldVerticesLength = vertexCount << 1;
 					box.vertices = vertices.vertices;
-					box.bones = vertices.bones;                    
+					box.bones = vertices.bones;
 					return box;
 				}
 			case AttachmentType.Mesh: {
 					String path = ReadString(input);
 					int color = ReadInt(input);
-					int vertexCount = ReadVarint(input, true);					
+					int vertexCount = ReadVarint(input, true);
 					float[] uvs = ReadFloatArray(input, vertexCount << 1, 1);
 					int[] triangles = ReadShortArray(input);
 					Vertices vertices = ReadVertices(input, vertexCount);
@@ -400,8 +400,8 @@ namespace Spine {
 					path.vertices = vertices.vertices;
 					path.bones = vertices.bones;
 					path.lengths = lengths;
-					return path;                    
-				}			
+					return path;
+				}
 			}
 			return null;
 		}
@@ -540,7 +540,7 @@ namespace Spine {
 			}
 
 			// IK timelines.
-			for (int i = 0, n = ReadVarint(input, true); i < n; i++) {				
+			for (int i = 0, n = ReadVarint(input, true); i < n; i++) {
 				int index = ReadVarint(input, true);
 				int frameCount = ReadVarint(input, true);
 				IkConstraintTimeline timeline = new IkConstraintTimeline(frameCount);
@@ -587,7 +587,7 @@ namespace Spine {
 									if (data.positionMode == PositionMode.Fixed) timelineScale = scale;
 								}
 								timeline.pathConstraintIndex = index;
-								for (int frameIndex = 0; frameIndex < frameCount; frameIndex++) {                                    
+								for (int frameIndex = 0; frameIndex < frameCount; frameIndex++) {
 									timeline.SetFrame(frameIndex, ReadFloat(input), ReadFloat(input) * timelineScale);
 									if (frameIndex < frameCount - 1) ReadCurve(input, frameIndex, timeline);
 								}
@@ -651,7 +651,7 @@ namespace Spine {
 
 							timeline.SetFrame(frameIndex, time, deform);
 							if (frameIndex < frameCount - 1) ReadCurve(input, frameIndex, timeline);
-						}							
+						}
 						timelines.Add(timeline);
 						duration = Math.Max(duration, timeline.frames[frameCount - 1]);
 					}
diff --git a/spine-csharp/src/SkeletonJson.cs b/spine-csharp/src/SkeletonJson.cs
index 7858b91fe..549c4752e 100644
--- a/spine-csharp/src/SkeletonJson.cs
+++ b/spine-csharp/src/SkeletonJson.cs
@@ -144,7 +144,7 @@ namespace Spine {
 						data.b = ToColor(color, 2);
 						data.a = ToColor(color, 3);
 					}
-						
+
 					data.attachmentName = GetString(slotMap, "attachment", null);
 					if (slotMap.ContainsKey("blend"))
 						data.blendMode = (BlendMode)Enum.Parse(typeof(BlendMode), (String)slotMap["blend"], false);
@@ -164,7 +164,7 @@ namespace Spine {
 						if (bone == null) throw new Exception("IK constraint bone not found: " + boneName);
 						data.bones.Add(bone);
 					}
-					
+
 					String targetName = (String)constraintMap["target"];
 					data.target = skeletonData.FindBone(targetName);
 					if (data.target == null) throw new Exception("Target bone not found: " + targetName);
@@ -289,7 +289,7 @@ namespace Spine {
 					} catch (Exception e) {
 						throw new Exception("Error reading animation: " + entry.Key, e);
 					}
-				}   
+				}
 			}
 
 			skeletonData.bones.TrimExcess();
@@ -632,7 +632,7 @@ namespace Spine {
 							var timeline = new DeformTimeline(values.Count);
 							timeline.slotIndex = slotIndex;
 							timeline.attachment = attachment;
-							
+
 							int frameIndex = 0;
 							foreach (Dictionary<String, Object> valueMap in values) {
 								float[] deform;
diff --git a/spine-csharp/src/TransformConstraint.cs b/spine-csharp/src/TransformConstraint.cs
index ce35b7a67..f675aa7e8 100644
--- a/spine-csharp/src/TransformConstraint.cs
+++ b/spine-csharp/src/TransformConstraint.cs
@@ -57,7 +57,7 @@ namespace Spine {
 			bones = new ExposedList<Bone>();
 			foreach (BoneData boneData in data.bones)
 				bones.Add (skeleton.FindBone (boneData.name));
-			
+
 			target = skeleton.FindBone(data.target.name);
 		}
 
diff --git a/spine-love/main.lua b/spine-love/main.lua
index d2a10ea96..439ca2057 100644
--- a/spine-love/main.lua
+++ b/spine-love/main.lua
@@ -34,74 +34,74 @@ local skeletons = {}
 local activeSkeleton = 1
 
 function loadSkeleton (jsonFile, atlasFile, animation, skin, scale, x, y)
-  local loader = function (path) return love.graphics.newImage("data/" .. path) end
-  local atlas = spine.TextureAtlas.new(spine.utils.readFile("data/" .. atlasFile .. ".atlas"), loader)
-  
-  local json = spine.SkeletonJson.new(spine.AtlasAttachmentLoader.new(atlas))
-  json.scale = scale
-  local skeletonData = json:readSkeletonDataFile("data/" .. jsonFile .. ".json")
-  local skeleton = spine.Skeleton.new(skeletonData)
-  skeleton.x = x
-  skeleton.y = y
-  skeleton.flipX = false
-  skeleton.flipY = true
-  if skin then 
-    skeleton:setSkin(skin)
-  end
-  skeleton:setToSetupPose()
-  
-  local stateData = spine.AnimationStateData.new(skeletonData)
-  local state = spine.AnimationState.new(stateData)
-  state:setAnimationByName(0, animation, true)
-  
-  state.onStart = function (trackIndex)
-    print(trackIndex.." start: "..state:getCurrent(trackIndex).animation.name)
-  end
-  state.onEnd = function (trackIndex)
-    print(trackIndex.." end: "..state:getCurrent(trackIndex).animation.name)
-  end 
-  state.onComplete = function (trackIndex, loopCount)
-    print(trackIndex.." complete: "..state:getCurrent(trackIndex).animation.name..", "..loopCount)
-  end
-  state.onEvent = function (trackIndex, event)
-    print(trackIndex.." event: "..state:getCurrent(trackIndex).animation.name..", "..event.data.name..", "..event.intValue..", "..event.floatValue..", '"..(event.stringValue or "").."'")
-  end
-  
-  state:update(0.5)
-  state:apply(skeleton)
-  
-  return { state = state, skeleton = skeleton }
+	local loader = function (path) return love.graphics.newImage("data/" .. path) end
+	local atlas = spine.TextureAtlas.new(spine.utils.readFile("data/" .. atlasFile .. ".atlas"), loader)
+
+	local json = spine.SkeletonJson.new(spine.AtlasAttachmentLoader.new(atlas))
+	json.scale = scale
+	local skeletonData = json:readSkeletonDataFile("data/" .. jsonFile .. ".json")
+	local skeleton = spine.Skeleton.new(skeletonData)
+	skeleton.x = x
+	skeleton.y = y
+	skeleton.flipX = false
+	skeleton.flipY = true
+	if skin then
+		skeleton:setSkin(skin)
+	end
+	skeleton:setToSetupPose()
+	
+	local stateData = spine.AnimationStateData.new(skeletonData)
+	local state = spine.AnimationState.new(stateData)
+	state:setAnimationByName(0, animation, true)
+	
+	state.onStart = function (trackIndex)
+		print(trackIndex.." start: "..state:getCurrent(trackIndex).animation.name)
+	end
+	state.onEnd = function (trackIndex)
+		print(trackIndex.." end: "..state:getCurrent(trackIndex).animation.name)
+	end
+	state.onComplete = function (trackIndex, loopCount)
+		print(trackIndex.." complete: "..state:getCurrent(trackIndex).animation.name..", "..loopCount)
+	end
+	state.onEvent = function (trackIndex, event)
+		print(trackIndex.." event: "..state:getCurrent(trackIndex).animation.name..", "..event.data.name..", "..event.intValue..", "..event.floatValue..", '"..(event.stringValue or "").."'")
+	end
+	
+	state:update(0.5)
+	state:apply(skeleton)
+	
+	return { state = state, skeleton = skeleton }
 end
 
 function love.load(arg)
-  if arg[#arg] == "-debug" then require("mobdebug").start() end
-  table.insert(skeletons, loadSkeleton("test", "test", "animation", nil, 0.5, 400, 300))
-  table.insert(skeletons, loadSkeleton("spineboy", "spineboy", "walk", nil, 0.5, 400, 500))
-  table.insert(skeletons, loadSkeleton("raptor", "raptor", "walk", nil, 0.3, 400, 500))
-  table.insert(skeletons, loadSkeleton("goblins-mesh", "goblins", "walk", "goblin", 1, 400, 500))
-  table.insert(skeletons, loadSkeleton("tank", "tank", "drive", nil, 0.2, 600, 500))
-  table.insert(skeletons, loadSkeleton("vine", "vine", "animation", nil, 0.3, 400, 500))
-  table.insert(skeletons, loadSkeleton("stretchyman", "stretchyman", "sneak", nil, 0.3, 200, 500))
-  skeletonRenderer = spine.SkeletonRenderer.new()
+	if arg[#arg] == "-debug" then require("mobdebug").start() end
+	table.insert(skeletons, loadSkeleton("test", "test", "animation", nil, 0.5, 400, 300))
+	table.insert(skeletons, loadSkeleton("spineboy", "spineboy", "walk", nil, 0.5, 400, 500))
+	table.insert(skeletons, loadSkeleton("raptor", "raptor", "walk", nil, 0.3, 400, 500))
+	table.insert(skeletons, loadSkeleton("goblins-mesh", "goblins", "walk", "goblin", 1, 400, 500))
+	table.insert(skeletons, loadSkeleton("tank", "tank", "drive", nil, 0.2, 600, 500))
+	table.insert(skeletons, loadSkeleton("vine", "vine", "animation", nil, 0.3, 400, 500))
+	table.insert(skeletons, loadSkeleton("stretchyman", "stretchyman", "sneak", nil, 0.3, 200, 500))
+	skeletonRenderer = spine.SkeletonRenderer.new()
 end
 
 function love.update (delta)
 	-- Update the state with the delta time, apply it, and update the world transforms.
-  local state = skeletons[activeSkeleton].state
-  local skeleton = skeletons[activeSkeleton].skeleton
+	local state = skeletons[activeSkeleton].state
+	local skeleton = skeletons[activeSkeleton].skeleton
 	state:update(delta)
 	state:apply(skeleton)
 	skeleton:updateWorldTransform()
 end
 
 function love.draw ()
-  love.graphics.setBackgroundColor(128, 128, 128, 255)
+	love.graphics.setBackgroundColor(128, 128, 128, 255)
 	love.graphics.setColor(255, 255, 255)
-  local skeleton = skeletons[activeSkeleton].skeleton
-  skeletonRenderer:draw(skeleton)
+	local skeleton = skeletons[activeSkeleton].skeleton
+	skeletonRenderer:draw(skeleton)
 end
 
 function love.mousepressed (x, y, button, istouch)
-  activeSkeleton = activeSkeleton + 1
-  if activeSkeleton > #skeletons then activeSkeleton = 1 end
+	activeSkeleton = activeSkeleton + 1
+	if activeSkeleton > #skeletons then activeSkeleton = 1 end
 end
diff --git a/spine-love/spine-love/dkjson.lua b/spine-love/spine-love/dkjson.lua
index d5d31a42a..9c10dac3d 100644
--- a/spine-love/spine-love/dkjson.lua
+++ b/spine-love/spine-love/dkjson.lua
@@ -27,26 +27,26 @@ cycles.
 
 `state` is an optional table with the following fields:
 
-	- `indent`	
+	- `indent`
 		When `indent` (a boolean) is set, the created string will contain
 		newlines and indentations. Otherwise it will be one long line.
-	- `keyorder`	
+	- `keyorder`
 		`keyorder` is an array to specify the ordering of keys in the
 		encoded output. If an object has keys which are not in this array
 		they are written after the sorted keys.
-	- `level`	 
+	- `level`
 		This is the initial level of indentation used when `indent` is
 		set. For each level two spaces are added. When absent it is set
 		to 0.
-	- `buffer`	
+	- `buffer`
 		`buffer` is an array to store the strings for the result so they
 		can be concatenated at once. When it isn't given, the encode
 		function will create it temporary and will return the
 		concatenated result.
-	- `bufferlen`	 
+	- `bufferlen`
 		When `bufferlen` is set, it has to be the index of the last
 		element of `buffer`.
-	- `tables`	
+	- `tables`
 		`tables` is a set to detect reference cycles. It is created
 		temporary when absent. Every table that is currently processed
 		is used as key, the value is `true`.
@@ -187,9 +187,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 <!-- This documentation can be parsed using Markdown to generate HTML.
-		 The source code is enclosed in a HTML comment so it won't be displayed
-		 by browsers, but it should be removed from the final HTML file as
-		 it isn't a valid HTML comment (and wastes space).
+	The source code is enclosed in a HTML comment so it won't be displayed
+	by browsers, but it should be removed from the final HTML file as
+	it isn't a valid HTML comment (and wastes space).
 	-->
 
 	<!--]==]
@@ -245,7 +245,7 @@ end
 
 local escapecodes = {
 	["\""] = "\\\"", ["\\"] = "\\\\", ["\b"] = "\\b", ["\f"] = "\\f",
-	["\n"] = "\\n",	 ["\r"] = "\\r",	["\t"] = "\\t"
+	["\n"] = "\\n", ["\r"] = "\\r", ["\t"] = "\\t"
 }
 
 local function escapeutf8 (uchar)
@@ -315,8 +315,7 @@ end
 
 function json.addnewline (state)
 	if state.indent then
-		state.bufferlen = addnewline2 (state.level or 0,
-													 state.buffer, state.bufferlen or #(state.buffer))
+		state.bufferlen = addnewline2 (state.level or 0, state.buffer, state.bufferlen or #(state.buffer))
 	end
 end
 
@@ -452,8 +451,7 @@ function json.encode (value, state)
 	state = state or {}
 	local oldbuffer = state.buffer
 	local buffer = oldbuffer or {}
-	local ret, msg = encode2 (value, state.indent, state.level or 0,
-									 buffer, state.bufferlen or 0, state.tables or {}, state.keyorder)
+	local ret, msg = encode2 (value, state.indent, state.level or 0, buffer, state.bufferlen or 0, state.tables or {}, state.keyorder)
 	if not ret then
 		error (msg, 2)
 	elseif oldbuffer then
@@ -705,7 +703,7 @@ function json.use_lpeg ()
 	local function UTF16Surrogate (match, pos, high, low)
 		high, low = tonumber (high, 16), tonumber (low, 16)
 		if 0xD800 <= high and high <= 0xDBff and 0xDC00 <= low and low <= 0xDFFF then
-			return true, unichar ((high - 0xD800)	 * 0x400 + (low - 0xDC00) + 0x10000)
+			return true, unichar ((high - 0xD800) * 0x400 + (low - 0xDC00) + 0x10000)
 		else
 			return false
 		end
diff --git a/spine-love/spine-love/spine.lua b/spine-love/spine-love/spine.lua
index 83bace899..b19b81b4f 100644
--- a/spine-love/spine-love/spine.lua
+++ b/spine-love/spine-love/spine.lua
@@ -91,18 +91,18 @@ function PolygonBatcher.new(vertexCount)
 		vertex = { 0, 0, 0, 0, 0, 0, 0, 0 },
 		indices = nil
 	}
-	
+
 	local indices = {}
 	local i = 1
 	local maxIndicesLength = self.maxIndicesLength
-	while i <= maxIndicesLength do 
+	while i <= maxIndicesLength do
 		indices[i] = 1
 		i = i + 1
 	end
 	self.indices = indices;
-	
+
 	setmetatable(self, PolygonBatcher)
-	
+
 	return self
 end
 
@@ -117,7 +117,7 @@ function PolygonBatcher:draw (texture, vertices, indices)
 	local numVertices = #vertices / 8
 	local numIndices = #indices
 	local mesh = self.mesh
-	
+
 	if texture ~= self.lastTexture then
 		self:flush()
 		self.lastTexture = texture
@@ -125,7 +125,7 @@ function PolygonBatcher:draw (texture, vertices, indices)
 	elseif self.verticesLength + numVertices >= self.maxVerticesLength or self.indicesLength + numIndices > self.maxIndicesLength then
 		self:flush()
 	end
-	
+
 	local i = 1
 	local indexStart = self.indicesLength + 1
 	local offset = self.verticesLength
@@ -137,7 +137,7 @@ function PolygonBatcher:draw (texture, vertices, indices)
 		i = i + 1
 	end
 	self.indicesLength = self.indicesLength + numIndices
-	
+
 	i = 1
 	local vertexStart = self.verticesLength + 1
 	local vertexEnd = vertexStart + numVertices
@@ -173,7 +173,7 @@ end
 function PolygonBatcher:stop ()
 	if not self.isDrawing then error("PolygonBatcher is not drawing. Call PolygonBatcher:begin() first.", 2) end
 	if self.verticesLength > 0 then self:flush() end
-	
+
 	self.lastTexture = nil
 	self.isDrawing = false
 end
@@ -195,12 +195,12 @@ end
 function SkeletonRenderer:draw (skeleton)
 	local batcher = self.batcher
 	local premultipliedAlpha = self.premultipliedAlpha
-	
+
 	local lastLoveBlendMode = love.graphics.getBlendMode()
 	love.graphics.setBlendMode("alpha")
 	local lastBlendMode = spine.BlendMode.normal
 	batcher:begin()
-	
+
 	local drawOrder = skeleton.drawOrder
 	for i, slot in ipairs(drawOrder) do
 		local attachment = slot.attachment
@@ -217,7 +217,7 @@ function SkeletonRenderer:draw (skeleton)
 				indices = attachment.triangles
 				texture = attachment.region.renderObject.texture
 			end
-			
+
 			if texture then
 				local slotBlendMode = slot.data.blendMode
 				if lastBlendMode ~= slotBlendMode then
@@ -238,7 +238,7 @@ function SkeletonRenderer:draw (skeleton)
 			end
 		end
 	end
-	
+
 	batcher:stop()
 	love.graphics.setBlendMode(lastLoveBlendMode)
 end
diff --git a/spine-lua/Animation.lua b/spine-lua/Animation.lua
index f805b1ca7..b0056cbf5 100644
--- a/spine-lua/Animation.lua
+++ b/spine-lua/Animation.lua
@@ -69,7 +69,7 @@ function Animation.new (name, timelines, duration)
 
 		if loop and duration > 0 then
 			time = time % self.duration
-			if lastTime > 0	 then lastTime = lastTime % self.duration end
+			if lastTime > 0 then lastTime = lastTime % self.duration end
 		end
 
 		for i,timeline in ipairs(self.timelines) do
@@ -132,7 +132,7 @@ function Animation.CurveTimeline.new (frameCount)
 	local self = {
 		curves = utils.newNumberArrayZero((frameCount - 1) * BEZIER_SIZE) -- type, x, y, ...
 	}
-	
+
 	function self:getFrameCount ()
 		return math.floor(zlen(self.curves) / BEZIER_SIZE) + 1
 	end
@@ -140,7 +140,7 @@ function Animation.CurveTimeline.new (frameCount)
 	function self:setStepped (frameIndex)
 		self.curves[frameIndex * BEZIER_SIZE] = STEPPED
 	end
-	
+
 	function self:getCurveType (frameIndex)
 		local index = frameIndex * BEZIER_SIZE
 		if index == zlen(self.curves) then return LINEAR end
@@ -225,7 +225,7 @@ function Animation.RotateTimeline.new (frameCount)
 	local self = Animation.CurveTimeline.new(frameCount)
 	self.boneIndex = -1
 	self.frames = utils.newNumberArrayZero(frameCount * 2)
-	
+
 	function self:setFrame (frameIndex, time, degrees)
 		frameIndex = frameIndex * 2
 		self.frames[frameIndex] = time
@@ -302,7 +302,7 @@ function Animation.TranslateTimeline.new (frameCount)
 		if time < frames[0] then return end -- Time is before first frame.
 
 		local bone = skeleton.bones[self.boneIndex]
-		
+
 		if time >= frames[zlen(frames) - ENTRIES] then -- Time is after last frame.
 			bone.x = bone.x + (bone.data.x + frames[zlen(frames) + PREV_X] - bone.x) * alpha
 			bone.y = bone.y + (bone.data.y + frames[zlen(frames) + PREV_Y] - bone.y) * alpha
@@ -485,7 +485,7 @@ function Animation.AttachmentTimeline.new (frameCount)
 
 	function self:apply (skeleton, lastTime, time, firedEvents, alpha)
 		local frames = self.frames
-		if time < frames[0] then return end	 
+		if time < frames[0] then return end
 
 		local frameIndex = 0
 		if time >= frames[zlen(frames) - 1] then
@@ -608,7 +608,6 @@ end
 
 Animation.DeformTimeline = {}
 function Animation.DeformTimeline.new (frameCount)
-	
 	local self = Animation.CurveTimeline.new(frameCount)
 	self.frames = utils.newNumberArrayZero(frameCount)
 	self.frameVertices = utils.newNumberArrayZero(frameCount)
@@ -626,7 +625,7 @@ function Animation.DeformTimeline.new (frameCount)
 		if not slotAttachment then return end
 		if not (slotAttachment.type == AttachmentType.mesh or slotAttachment.type == AttachmentType.linkedmesh or slotAttachment.type == AttachmentType.path) then return end
 		if not slotAttachment:applyDeform(self.attachment) then return end
-			
+
 		local frames = self.frames
 		if time < frames[0] then return end -- Time is before first frame.
 
@@ -761,7 +760,7 @@ function Animation.TransformConstraintTimeline.new (frameCount)
 		if time < frames[0] then return end -- Time is before first frame.
 
 		local constraint = skeleton.transformConstraints[self.transformConstraintIndex]
-		
+
 		if time >= frames[zlen(frames) - ENTRIES] then -- Time is after last frame.
 				local i = zlen(frames)
 				constraint.rotateMix = constraintMix.rotateMix + (frames[i + PREV_ROTATE] - constraint.rotateMix) * alpha
diff --git a/spine-lua/AnimationState.lua b/spine-lua/AnimationState.lua
index ebd87cbb8..a0286d5e9 100644
--- a/spine-lua/AnimationState.lua
+++ b/spine-lua/AnimationState.lua
@@ -141,7 +141,7 @@ function AnimationState.new (data)
 				else
 					complete = lastTime < endTime and time >= endTime
 				end
-				if complete then 
+				if complete then
 					local count = math.floor(time / endTime)
 					if current.onComplete then current.onComplete(i, count) end
 					if self.onComplete then self.onComplete(i, count) end
diff --git a/spine-lua/AnimationStateData.lua b/spine-lua/AnimationStateData.lua
index b8142deb6..0cd9de3d7 100644
--- a/spine-lua/AnimationStateData.lua
+++ b/spine-lua/AnimationStateData.lua
@@ -45,7 +45,7 @@ function AnimationStateData.new (skeletonData)
 		end
 		self.animationToMixTime[fromName][toName] = duration
 	end
-	
+
 	function self:getMix (fromName, toName)
 		local first = self.animationToMixTime[fromName]
 		if not first then return self.defaultMix end
diff --git a/spine-lua/Atlas.lua b/spine-lua/Atlas.lua
index 0a6cfcaaa..662572dc7 100644
--- a/spine-lua/Atlas.lua
+++ b/spine-lua/Atlas.lua
@@ -42,11 +42,11 @@ function Atlas.parse(atlasPath, atlasBase)
 		local a,b = tonumber( a ), tonumber( b )
 		return a and b and {a, b}
 	end
-	
+
 	if not atlasPath then
 		error("Error: " .. atlasPath .. ".atlas" .. " doesn't exist!")
 		return nil
-	end 
+	end
 
 	local atlasLines = spine.utils.readFile( atlasPath, atlasBase )
 	if not atlasLines then
@@ -57,7 +57,7 @@ function Atlas.parse(atlasPath, atlasBase)
 	local pages = {}
 
 
-	local it = string.gmatch(atlasLines, "(.-)\r?\n")	 -- iterate over lines
+	local it = string.gmatch(atlasLines, "(.-)\r?\n") -- iterate over lines
 	for l in it do
 		if #l == 0 then
 			l = it()
@@ -73,7 +73,7 @@ function Atlas.parse(atlasPath, atlasBase)
 				page.wrap = string.match( it(), "%a+: (.+)" )
 				page.regions = {}
 				table.insert( pages, page )
-			else 
+			else
 				break
 			end
 		else
diff --git a/spine-lua/AttachmentLoader.lua b/spine-lua/AttachmentLoader.lua
index 7eefd5e22..2cb246588 100644
--- a/spine-lua/AttachmentLoader.lua
+++ b/spine-lua/AttachmentLoader.lua
@@ -53,7 +53,7 @@ function AttachmentLoader.new ()
 	function self:newBoundingBoxAttachment (skin, name)
 		return BoundingBoxAttachment.new(name)
 	end
-	
+
 	function self:newPathAttachment(skin, name)
 		return PathAttachment.new(name)
 	end
diff --git a/spine-lua/Bone.lua b/spine-lua/Bone.lua
index 8461abf92..4b27dfd8f 100644
--- a/spine-lua/Bone.lua
+++ b/spine-lua/Bone.lua
@@ -37,13 +37,13 @@ local math_atan2 = math.atan2
 local math_sqrt = math.sqrt
 
 function math.sign(x)
-	 if x<0 then
-		 return -1
-	 elseif x>0 then
-		 return 1
-	 else
-		 return 0
-	 end
+	if x<0 then
+		return -1
+	elseif x>0 then
+		return 1
+	else
+		return 0
+	end
 end
 
 local math_sign = math.sign
@@ -84,7 +84,7 @@ end
 
 function Bone:updateWorldTransformWith (x, y, rotation, scaleX, scaleY, shearX, shearY)
 	self.appliedRotation = rotation
-	
+
 	local rotationY = rotation + 90 + shearY
 	local rotationRad = math_rad(rotation + shearX)
 	local rotationYRad = math_rad(rotationY)
@@ -318,10 +318,10 @@ function updateLocalTransform ()
 		self.rotation = 90 - math_deg(math_atan2(rd, rb))
 	end
 	self.appliedRotation = self.rotation
-end 
+end
 
 function Bone:worldToLocal (world)
-	local a = self.a 
+	local a = self.a
 	local b = self.b
 	local c = self.c
 	local d = self.d
diff --git a/spine-lua/Color.lua b/spine-lua/Color.lua
index 431f44327..51e1e124f 100644
--- a/spine-lua/Color.lua
+++ b/spine-lua/Color.lua
@@ -39,7 +39,7 @@ function Color.new ()
 		r = 0, g = 0, b = 0, a = 0
 	}
 	setmetatable(self, Color)
-	
+
 	return self
 end
 
@@ -48,7 +48,7 @@ function Color.newWith (r, g, b, a)
 		r = a, g = g, b = b, a = a
 	}
 	setmetatable(self, Color)
-	
+
 	return self
 end
 
diff --git a/spine-lua/IkConstraint.lua b/spine-lua/IkConstraint.lua
index 9e1589447..e01066c69 100644
--- a/spine-lua/IkConstraint.lua
+++ b/spine-lua/IkConstraint.lua
@@ -74,9 +74,9 @@ function IkConstraint:update ()
 	local target = self.target
 	local bones = self.bones
 	local boneCount = #bones
-	if boneCount == 1 then 
+	if boneCount == 1 then
 		self:apply1(bones[1], target.worldX, target.worldY, self.mix)
-	elseif boneCount == 2 then 
+	elseif boneCount == 2 then
 		self:apply2(bones[1], bones[2], target.worldX, target.worldY, self.bendDirection, self.mix)
 	end
 end
@@ -92,7 +92,7 @@ function IkConstraint:apply1 (bone, targetX, targetY, alpha)
 	if bone.scaleX < 0 then rotationIK = rotationIK + 180 end
 	if rotationIK > 180 then
 		rotationIK = rotationIK - 360
-	elseif (rotationIK < -180) then 
+	elseif (rotationIK < -180) then
 		rotationIK = rotationIK + 360
 	end
 	bone:updateWorldTransformWith(bone.x, bone.y, bone.rotation + rotationIK * alpha, bone.scaleX, bone.scaleY, bone.shearX, bone.shearY)
@@ -153,7 +153,7 @@ function IkConstraint:apply2 (parent, child, targetX, targetY, bendDir, alpha)
 	c = pp.c
 	d = pp.d
 	local id = 1 / (a * d - b * c)
-	local x = targetX - pp.worldX 
+	local x = targetX - pp.worldX
 	local y = targetY - pp.worldY
 	local tx = (x * d - y * b) * id - px
 	local ty = (y * a - x * c) * id - py
@@ -165,7 +165,7 @@ function IkConstraint:apply2 (parent, child, targetX, targetY, bendDir, alpha)
 	local l2 = child.data.length * csx
 	local a1 = 0
 	local a2 = 0
-	
+
 	if u then
 		l2 = l2 * psx
 		local cos = (tx * tx + ty * ty - l1 * l1 - l2 * l2) / (2 * l1 * l2)
@@ -269,7 +269,7 @@ function IkConstraint:apply2 (parent, child, targetX, targetY, bendDir, alpha)
 	elseif a2 < -180 then
 		a2 = a2 + 360
 	end
-	child:updateWorldTransformWith(cx, cy, rotation + a2 * alpha, child.scaleX, child.scaleY, child.shearX, child.shearY);	
+	child:updateWorldTransformWith(cx, cy, rotation + a2 * alpha, child.scaleX, child.scaleY, child.shearX, child.shearY);
 end
 
 return IkConstraint
diff --git a/spine-lua/PathConstraint.lua b/spine-lua/PathConstraint.lua
index 8659fe647..cbaa58b7c 100644
--- a/spine-lua/PathConstraint.lua
+++ b/spine-lua/PathConstraint.lua
@@ -29,7 +29,7 @@
 -------------------------------------------------------------------------------
 
 -- FIXME the logic in this file uses 0-based indexing. Each array
--- access adds 1 to the calculated index. We should switch the logic 
+-- access adds 1 to the calculated index. We should switch the logic
 -- to 1-based indexing eventually.
 
 local setmetatable = setmetatable
@@ -76,7 +76,7 @@ function PathConstraint.new (data, skeleton)
 		segments = {}
 	}
 	setmetatable(self, PathConstraint)
-	
+
 	for i,boneData in ipairs(data.bones) do
 		table_insert(self.bones, skeleton:findBone(boneData.name))
 	end
@@ -94,7 +94,7 @@ function PathConstraint:update ()
 
 	local rotateMix = self.rotateMix
 	local translateMix = self.translateMix
-	local translate = translateMix > 0 
+	local translate = translateMix > 0
 	local rotate = rotateMix > 0
 	if not translate and not rotate then return end
 
@@ -103,7 +103,7 @@ function PathConstraint:update ()
 	local lengthSpacing = spacingMode == PathConstraintData.SpacingMode.length
 	local rotateMode = data.rotateMode
 	local tangents = rotateMode == PathConstraintData.RotateMode.tangent
-	local scale = rotateMode == PathConstraintData.RotateMode.chainscale 
+	local scale = rotateMode == PathConstraintData.RotateMode.chainscale
 	local bones = self.bones
 	local boneCount = #bones
 	local spacesCount = boneCount + 1
@@ -281,7 +281,7 @@ function PathConstraint:computeWorldPositions (path, spacesCount, tangents, perc
 				end
 				self:addCurvePosition(p, world[1], world[2], world[3], world[4], world[5], world[6], world[7], world[8], out, o, tangents or (i > 0 and space == 0))
 			end
-			
+
 			i = i + 1
 			o = o + 3
 		end
@@ -360,7 +360,7 @@ function PathConstraint:computeWorldPositions (path, spacesCount, tangents, perc
 	if percentPosition then position = position * pathLength end
 	if percentSpacing then
 		local i = 0
-		while	 i < spacesCount do
+		while i < spacesCount do
 			spaces[i + 1] = spaces[i + 1] * pathLength
 			i = i + 1
 		end
diff --git a/spine-lua/RegionAttachment.lua b/spine-lua/RegionAttachment.lua
index 7baaeba98..e6462a2c7 100644
--- a/spine-lua/RegionAttachment.lua
+++ b/spine-lua/RegionAttachment.lua
@@ -33,7 +33,7 @@ local AttachmentType = require "spine-lua.AttachmentType"
 local RegionAttachment = {}
 function RegionAttachment.new (name)
 	if not name then error("name cannot be nil", 2) end
-	
+
 	local self = {
 		name = name,
 		type = AttachmentType.region,
diff --git a/spine-lua/Skeleton.lua b/spine-lua/Skeleton.lua
index 18ac3e6eb..c90051da7 100644
--- a/spine-lua/Skeleton.lua
+++ b/spine-lua/Skeleton.lua
@@ -88,15 +88,15 @@ function Skeleton.new (data)
 	for i,ikConstraintData in ipairs(data.ikConstraints) do
 		table_insert(self.ikConstraints, IkConstraint.new(ikConstraintData, self))
 	end
-	
+
 	for i, transformConstraintData in ipairs(data.transformConstraints) do
 		table_insert(self.transformConstraints, TransformConstraint.new(transformConstraintData, self))
 	end
-	
+
 	for i, pathConstraintData in ipairs(data.pathConstraints) do
 		table_insert(self.pathConstraints, PathConstraint.new(pathConstraintData, self))
 	end
-	
+
 	self:updateCache()
 
 	return self
@@ -107,18 +107,18 @@ end
 function Skeleton:updateCache ()
 	local updateCache = {}
 	self._updateCache = updateCache
-	
+
 	local bones = self.bones
 	for i, bone in ipairs(bones) do
 		bone.sorted = false
 	end
-	
+
 	local ikConstraints = {}
 	self.ikConstraintsSorted = ikConstraints
 	for i, constraint in ipairs(self.ikConstraints) do
 		table_insert(ikConstraints, constraint)
 	end
-	
+
 	local level = 0
 	for i, ik in ipairs(ikConstraints) do
 		local bone = ik.bones[1].parent
@@ -129,7 +129,7 @@ function Skeleton:updateCache ()
 		end
 		ik.level = level
 	end
-	
+
 	local i = 1
 	local ikCount = #ikConstraints
 	while i < ikCount do
@@ -145,19 +145,19 @@ function Skeleton:updateCache ()
 		ikConstraints[ii + 1 + 1] = ik
 		i = i + 1
 	end
-	
+
 	for i, constraint in ipairs(ikConstraints) do
 		local target = constraint.target
 		self:sortBone(target)
-		
+
 		local constrained = constraint.bones
 		local parent = constrained[1]
 		self:sortBone(parent)
-		
+
 		table_insert(updateCache, constraint)
-		
+
 		self:sortReset(parent.children)
-		constrained[#constrained].sorted = true		 
+		constrained[#constrained].sorted = true
 	end
 
 	-- path constraints
@@ -169,19 +169,19 @@ function Skeleton:updateCache ()
 		if self.skin then self:sortPathConstraintAttachment(self.skin, slotIndex, slotBone) end
 		if self.data.defaultSkin and self.data.defaultSkin ~= self.skin then self:sortPathConstraintAttachment(self.data.defaultSkin, slotIndex, slotBone) end
 		for i,skin in ipairs(self.data.skins) do
-			self:sortPathConstraintAttachment(skin, slotIndex, slotBone)			
+			self:sortPathConstraintAttachment(skin, slotIndex, slotBone)
 		end
-		
+
 		local attachment = slot.attachment
 		if attachment.type == AttachmentType.path then self:sortPathConstraintAttachmentWith(attachment, slotBone) end
-		
+
 		local constrained = constraint.bones
 		for i,c in ipairs(constrained) do
 			self:sortBone(c)
 		end
-		
+
 		table_insert(updateCache, constraint)
-		
+
 		for i,c in ipairs(constrained) do
 			self:sortReset(c.children)
 		end
@@ -189,19 +189,19 @@ function Skeleton:updateCache ()
 			c.sorted = true
 		end
 	end
-	
+
 	-- transform constraints
 	local transformConstraints = self.transformConstraints
 	for i, constraint in ipairs(transformConstraints) do
 		self:sortBone(constraint.target)
-		
+
 		local constrained = constraint.bones
 		for i,c in ipairs(constrained) do
 			self:sortBone(c)
 		end
-		
+
 		table_insert(updateCache, constraint)
-		
+
 		for i,c in ipairs(constrained) do
 			self:sortReset(c.children)
 		end
@@ -209,7 +209,7 @@ function Skeleton:updateCache ()
 			c.sorted = true
 		end
 	end
-	
+
 	for i, bone in ipairs(self.bones) do
 		self:sortBone(bone)
 	end
@@ -281,7 +281,7 @@ function Skeleton:setBonesToSetupPose ()
 		ikConstraint.bendDirection = ikConstraint.data.bendDirection
 		ikConstraint.mix = ikConstraint.data.mix
 	end
-	
+
 	local transformConstraints = self.transformConstraints
 	for i, constraint in ipairs(transformConstraints) do
 		local data = constraint.data
@@ -290,7 +290,7 @@ function Skeleton:setBonesToSetupPose ()
 		constraint.scaleMix = data.scaleMix
 		constraint.shearMix = data.shearMix
 	end
-	
+
 	local pathConstraints = self.pathConstraints
 	for i, constraint in ipairs(pathConstraints) do
 		local data = constraint.data
@@ -341,8 +341,8 @@ function Skeleton:findSlotIndex(slotName)
 	return -1
 end
 
--- Sets the skin used to look up attachments before looking in the {@link SkeletonData#getDefaultSkin() default skin}. 
--- Attachments from the new skin are attached if the corresponding attachment from the old skin was attached. If there was 
+-- Sets the skin used to look up attachments before looking in the {@link SkeletonData#getDefaultSkin() default skin}.
+-- Attachments from the new skin are attached if the corresponding attachment from the old skin was attached. If there was
 -- no old skin, each slot's setup mode attachment is attached from the new skin.
 function Skeleton:setSkin (skinName)
 	local skin = self.data:findSkin(skinName)
diff --git a/spine-lua/SkeletonJson.lua b/spine-lua/SkeletonJson.lua
index 86cd92485..10168dec8 100644
--- a/spine-lua/SkeletonJson.lua
+++ b/spine-lua/SkeletonJson.lua
@@ -65,7 +65,7 @@ function SkeletonJson.new (attachmentLoader)
 	local readAnimation
 	local readCurve
 	local getArray
-	
+
 	local getValue = function (map, name, default)
 		local value = map[name]
 		if value == nil then return default else return value end
@@ -90,7 +90,7 @@ function SkeletonJson.new (attachmentLoader)
 		-- Bones.
 		for i,boneMap in ipairs(root["bones"]) do
 			local boneName = boneMap["name"]
-			
+
 			local parent = nil
 			local parentName = boneMap["parent"]
 			if parentName then
@@ -108,10 +108,10 @@ function SkeletonJson.new (attachmentLoader)
 			data.shearY = getValue(boneMap, "shearY", 0);
 			data.inheritRotation = getValue(boneMap, "inheritRotation", true);
 			data.inheritScale = getValue(boneMap, "inheritScale", true);
-			
+
 			table_insert(skeletonData.bones, data)
 		end
-		
+
 		-- Slots.
 		if root["slots"] then
 			for i,slotMap in ipairs(root["slots"]) do
@@ -124,10 +124,10 @@ function SkeletonJson.new (attachmentLoader)
 
 				local color = slotMap["color"]
 				if color then
-					data.color:set(tonumber(color:sub(1, 2), 16) / 255, 
-												 tonumber(color:sub(3, 4), 16) / 255,
-												 tonumber(color:sub(5, 6), 16) / 255,
-												 tonumber(color:sub(7, 8), 16) / 255)
+					data.color:set(tonumber(color:sub(1, 2), 16) / 255,
+					               tonumber(color:sub(3, 4), 16) / 255,
+					               tonumber(color:sub(5, 6), 16) / 255,
+					               tonumber(color:sub(7, 8), 16) / 255)
 				end
 
 				data.attachmentName = getValue(slotMap, "attachment", nil)
@@ -159,22 +159,22 @@ function SkeletonJson.new (attachmentLoader)
 				table_insert(skeletonData.ikConstraints, data)
 			end
 		end
-		
+
 		-- Transform constraints
 		if root["transform"] then
 			for i,constraintMap in ipairs(root["transform"]) do
 				data = TransformConstraintData.new(constraintMap.name)
-				
+
 				for i,boneName in ipairs(constraintMap.bones) do
 					local bone = skeletonData:findBone(boneName)
 					if not bone then error("Transform constraint bone not found: " .. boneName, 2) end
 					table_insert(data.bones, bone)
 				end
-				
+
 				local targetName = constraintMap.target
 				data.target = skeletonData:findBone(targetName)
 				if not data.target then error("Transform constraint target bone not found: " .. boneName, 2) end
-				
+
 				data.offsetRotation = getValue(constraintMap, "rotation", 0);
 				data.offsetX = getValue(constraintMap, "x", 0) * scale;
 				data.offsetY = getValue(constraintMap, "y", 0) * scale;
@@ -190,7 +190,7 @@ function SkeletonJson.new (attachmentLoader)
 				table_insert(skeletonData.transformConstraints, data)
 			end
 		end
-		
+
 		-- Path constraints
 		if root["path"] then
 			for i,constraintMap in ipairs(root.path) do
@@ -238,7 +238,7 @@ function SkeletonJson.new (attachmentLoader)
 				if skin.name == "default" then skeletonData.defaultSkin = skin end
 			end
 		end
-		
+
 		-- Linked meshes
 		for i, linkedMesh in ipairs(self.linkedMeshes) do
 			local skin = skeletonData.defaultSkin
@@ -290,44 +290,44 @@ function SkeletonJson.new (attachmentLoader)
 			region.rotation = getValue(map, "rotation", 0);
 			region.width = map.width * scale;
 			region.height = map.height * scale;
-			
+
 			local color = map["color"]
 			if color then
-				region.color:set(tonumber(color:sub(1, 2), 16) / 255, 
-												 tonumber(color:sub(3, 4), 16) / 255,
-												 tonumber(color:sub(5, 6), 16) / 255,
-												 tonumber(color:sub(7, 8), 16) / 255)
+				region.color:set(tonumber(color:sub(1, 2), 16) / 255,
+				                 tonumber(color:sub(3, 4), 16) / 255,
+				                 tonumber(color:sub(5, 6), 16) / 255,
+				                 tonumber(color:sub(7, 8), 16) / 255)
 			end
 
 			region:updateOffset()
 			return region
-			
+
 		elseif type == AttachmentType.boundingbox then
 			local box = attachmentLoader:newBoundingBoxAttachment(skin, name)
 			if not box then return nil end
 			readVertices(map, box, map.vertexCount * 2)
 			local color = map.color
 			if color then
-				box.color:set(tonumber(color:sub(1, 2), 16) / 255, 
-											tonumber(color:sub(3, 4), 16) / 255,
-											tonumber(color:sub(5, 6), 16) / 255,
-											tonumber(color:sub(7, 8), 16) / 255)
+				box.color:set(tonumber(color:sub(1, 2), 16) / 255,
+				              tonumber(color:sub(3, 4), 16) / 255,
+				              tonumber(color:sub(5, 6), 16) / 255,
+				              tonumber(color:sub(7, 8), 16) / 255)
 			end
 			return box
-			
+
 		elseif type == AttachmentType.mesh or type == AttachmentType.linkedmesh then
 			local mesh = attachmentLoader:newMeshAttachment(skin, name, path)
 			if not mesh then return null end
 			mesh.path = path
-			
+
 			local color = map.color
 			if color then
-				mesh.color:set(tonumber(color:sub(1, 2), 16) / 255, 
-												 tonumber(color:sub(3, 4), 16) / 255,
-												 tonumber(color:sub(5, 6), 16) / 255,
-												 tonumber(color:sub(7, 8), 16) / 255)
+				mesh.color:set(tonumber(color:sub(1, 2), 16) / 255,
+				               tonumber(color:sub(3, 4), 16) / 255,
+				               tonumber(color:sub(5, 6), 16) / 255,
+				               tonumber(color:sub(7, 8), 16) / 255)
 			end
-			
+
 			local parent = map.parent
 			if parent then
 				mesh.inheritDeform = getValue(map, "deform", true)
@@ -339,7 +339,7 @@ function SkeletonJson.new (attachmentLoader)
 				})
 				return mesh
 			end
-			
+
 			local uvs = getArray(map, "uvs", 1)
 			readVertices(map, mesh, #uvs)
 			mesh.triangles = getArray(map, "triangles", 1)
@@ -352,7 +352,7 @@ function SkeletonJson.new (attachmentLoader)
 
 			mesh.hullLength = getValue(map, "hull", 0) * 2
 			return mesh
-	
+
 		elseif type == AttachmentType.path then
 			local path = self.attachmentLoader:newPathAttachment(skin, name)
 			if not path then return nil end
@@ -370,17 +370,17 @@ function SkeletonJson.new (attachmentLoader)
 
 			local color = map.color
 			if color then
-				path.color:set(tonumber(color:sub(1, 2), 16) / 255, 
-												 tonumber(color:sub(3, 4), 16) / 255,
-												 tonumber(color:sub(5, 6), 16) / 255,
-												 tonumber(color:sub(7, 8), 16) / 255)
+				path.color:set(tonumber(color:sub(1, 2), 16) / 255,
+				               tonumber(color:sub(3, 4), 16) / 255,
+				               tonumber(color:sub(5, 6), 16) / 255,
+				               tonumber(color:sub(7, 8), 16) / 255)
 			end
 			return path;
 		end
 
 		error("Unknown attachment type: " .. type .. " (" .. name .. ")")
 	end
-	
+
 	readVertices = function (map, attachment, verticesLength)
 		local scale = self.scale
 		attachment.worldVerticesLength = verticesLength
@@ -397,7 +397,7 @@ function SkeletonJson.new (attachmentLoader)
 			attachment.vertices = vertices
 			return
 		end
-		
+
 		local weights = {}
 		local bones = {}
 		local i = 0
@@ -439,7 +439,7 @@ function SkeletonJson.new (attachmentLoader)
 						for i,valueMap in ipairs(values) do
 							local color = valueMap["color"]
 							timeline:setFrame(
-								frameIndex, valueMap["time"], 
+								frameIndex, valueMap["time"],
 								tonumber(color:sub(1, 2), 16) / 255,
 								tonumber(color:sub(3, 4), 16) / 255,
 								tonumber(color:sub(5, 6), 16) / 255,
@@ -548,7 +548,7 @@ function SkeletonJson.new (attachmentLoader)
 				duration = math.max(duration, timeline.frames[(timeline:getFrameCount() - 1) * Animation.IkConstraintTimeline.ENTRIES])
 			end
 		end
-		
+
 		-- Transform constraint timelines.
 		local transform = map["transform"]
 		if transform then
@@ -562,8 +562,8 @@ function SkeletonJson.new (attachmentLoader)
 					end
 				end
 				local frameIndex = 0
-				for i,valueMap in ipairs(values) do					 
-					timeline:setFrame(frameIndex, valueMap.time, getValue(valueMap, "rotateMix", 1), getValue(valueMap, "translateMix", 1), getValue(valueMap, "scaleMix", 1), getValue(valueMap, "shearMix", 1))
+				for i,valueMap in ipairs(values) do
+					timeline:setFrame(frameIndex, valueMap.time, getValue(valueMap, "rotateMix", 1), getValue(valueMap, "translateMix", 1), getValue(valueMap, "scaleMix", 1) getValue(valueMap, "shearMix", 1))
 					readCurve(valueMap, timeline, frameIndex)
 					frameIndex = frameIndex + 1
 				end
@@ -571,7 +571,7 @@ function SkeletonJson.new (attachmentLoader)
 				duration = math.max(duration, timeline.frames[(timeline:getFrameCount() - 1) * Animation.TransformConstraintTimeline.ENTRIES])
 			end
 		end
-		
+
 		-- Path constraint timelines.
 		if map.paths then
 			for constraintName,constraintMap in pairs(map.paths) do
@@ -587,7 +587,7 @@ function SkeletonJson.new (attachmentLoader)
 							if data.spacingMode == PathConstraintData.SpacingMode.length or data.spacingMode == PathConstraintData.SpacingMode.fixed then timelineScale = scale end
 						else
 							timeline = Animation.PathConstraintPositionTimeline.new(#timelineMap)
-							if data.positionMode == PathConstraintData.PositionMode.fixed then timelineScale = scale end							
+							if data.positionMode == PathConstraintData.PositionMode.fixed then timelineScale = scale end
 						end
 						timeline.pathConstraintIndex = index
 						local frameIndex = 0
@@ -609,11 +609,11 @@ function SkeletonJson.new (attachmentLoader)
 						end
 						table_insert(timelines, timeline)
 						duration = math.max(duration, timeline.frames[(timeline:getFrameCount() - 1) * Animation.PathConstraintMixTimeline.ENTRIES])
-					end					 
+					end
 				end
 			end
 		end
-		
+
 		-- Deform timelines.
 		if map.deform then
 			for deformName, deformMap in pairs(map.deform) do
diff --git a/spine-lua/Skin.lua b/spine-lua/Skin.lua
index e34d8c40e..ec8329b33 100644
--- a/spine-lua/Skin.lua
+++ b/spine-lua/Skin.lua
@@ -36,7 +36,7 @@ Skin.__index = Skin
 
 function Skin.new (name)
 	if not name then error("name cannot be nil", 2) end
-	
+
 	local self = {
 		name = name,
 		attachments = {}
@@ -55,7 +55,7 @@ end
 function Skin:getAttachment (slotIndex, name)
 	if not name then error("name cannot be nil.", 2) end
 	local dictionary = self.attachments[slotIndex]
-	if dictionary then 
+	if dictionary then
 		return dictionary[name]
 	else
 		return nil
diff --git a/spine-lua/SlotData.lua b/spine-lua/SlotData.lua
index d98056cc5..f9e479e16 100644
--- a/spine-lua/SlotData.lua
+++ b/spine-lua/SlotData.lua
@@ -40,7 +40,7 @@ function SlotData.new (index, name, boneData)
 	if index < 0 then error("index must be >= 0", 2) end
 	if not name then error("name cannot be nil", 2) end
 	if not boneData then error("boneData cannot be nil", 2) end
-	
+
 	local self = {
 		index = index,
 		name = name,
@@ -50,7 +50,7 @@ function SlotData.new (index, name, boneData)
 		blendMode = BlendMode.normal
 	}
 	setmetatable(self, SlotData)
-	
+
 	return self
 end
 
diff --git a/spine-lua/TextureAtlas.lua b/spine-lua/TextureAtlas.lua
index 9192fe129..2f9db733b 100644
--- a/spine-lua/TextureAtlas.lua
+++ b/spine-lua/TextureAtlas.lua
@@ -64,38 +64,38 @@ function TextureAtlas.new (atlasContent, imageLoader)
 		regions = {}
 	}
 	setmetatable(self, TextureAtlas)
-	
+
 	self:parse(atlasContent, imageLoader)
-	
+
 	return self
 end
 
 function TextureAtlas:parse (atlasContent, imageLoader)
 	if not atlasContent then error("atlasContent cannot be nil.", 2) end
 	if not imageLoader then error("imageLoader cannot be nil.", 2) end
-	
-	local lines = {}	
+
+	local lines = {}
 	local index = 0
 	local numLines = 0
 	for line in atlasContent:gmatch("[^\r\n]+") do
 		lines[numLines] = line
 		numLines = numLines + 1
 	end
-	
+
 	local readLine = function ()
 		if index >= numLines then return nil end
 		local line = lines[index]
 		index = index + 1
 		return line
 	end
-	
+
 	local readValue = function ()
 		local line = readLine()
 		local idx = line:find(":")
 		if not idx then error("Invalid line: " .. line, 2) end
 		return line:sub(idx + 1):match'^%s*(.*%S)' or ''
 	end
-	
+
 	local readTuple = function ()
 		local line = readLine()
 		local idx = line:find(":")
@@ -113,11 +113,11 @@ function TextureAtlas:parse (atlasContent, imageLoader)
 		tuple[i] = line:sub(lastMatch):match'^%s*(.*%S)' or ''
 		return tuple
 	end
-	
+
 	local parseInt = function (str)
 		return tonumber(str)
 	end
-	
+
 	local filterFromString = function (str)
 		str = str:lower()
 		if str == "nearest" then return TextureFilter.Nearest
@@ -130,18 +130,18 @@ function TextureAtlas:parse (atlasContent, imageLoader)
 		else error("Unknown texture wrap: " .. str, 2)
 		end
 	end
-	
+
 	local page = nil
 	while true do
 		local line = readLine()
 		if not line then break end
 		line = line:match'^%s*(.*%S)' or ''
-		if line:len() == 0 then 
+		if line:len() == 0 then
 			page = nil
 		elseif not page then
 			page = TextureAtlasPage.new()
 			page.name = line
-			
+
 			local tuple = readTuple()
 			if #tuple == 2 then
 				page.width = parseInt(tuple[1])
@@ -153,11 +153,11 @@ function TextureAtlas:parse (atlasContent, imageLoader)
 				-- wrapper objects for images to get the page size from
 				error("Atlas must specify page width/height. Please export to the latest atlas format", 2)
 			end
-			
+
 			tuple = readTuple()
 			page.minFilter = filterFromString(tuple[1])
 			page.magFilter = filterFromString(tuple[2])
-			
+
 			local direction = readValue()
 			page.uWrap = TextureWrap.ClampToEdge
 			page.vWrap = TextureWrap.ClampToEdge
@@ -169,7 +169,7 @@ function TextureAtlas:parse (atlasContent, imageLoader)
 				page.uWrap = TextureWrap.Repeat
 				page.vWrap = TextureWrap.Repeat
 			end
-			
+
 			page.texture = imageLoader(line)
 			-- FIXME page.texture:setFilters(page.minFilter, page.magFilter)
 			-- FIXME page.texture:setWraps(page.uWrap, page.vWrap)
@@ -178,17 +178,17 @@ function TextureAtlas:parse (atlasContent, imageLoader)
 			local region = TextureAtlasRegion.new()
 			region.name = line
 			region.page = page
-			
+
 			if readValue() == "true" then region.rotate = true end
-			
+
 			local tuple = readTuple()
 			local x = parseInt(tuple[1])
 			local y = parseInt(tuple[2])
-			
+
 			tuple = readTuple()
 			local width = parseInt(tuple[1])
 			local height = parseInt(tuple[2])
-			
+
 			region.u = x / page.width
 			region.v = y / page.height
 			if region.rotate then
@@ -198,12 +198,12 @@ function TextureAtlas:parse (atlasContent, imageLoader)
 				region.u2 = (x + width) / page.width
 				region.v2 = (y + height) / page.height
 			end
-			
+
 			region.x = x
 			region.y = y
 			region.width = math_abs(width)
 			region.height = math_abs(height)
-			
+
 			-- Read and skip optional splits
 			tuple = readTuple()
 			if #tuple == 4 then
@@ -212,14 +212,14 @@ function TextureAtlas:parse (atlasContent, imageLoader)
 					readTuple()
 				end
 			end
-			
+
 			region.originalWidth = parseInt(tuple[1])
 			region.originalHeight = parseInt(tuple[2])
-			
+
 			tuple = readTuple()
 			region.offsetX = parseInt(tuple[1])
 			region.offsetY = parseInt(tuple[2])
-			
+
 			region.index = parseInt(readValue())
 			region.texture = page.texture
 			table_insert(self.regions, region)
diff --git a/spine-lua/TextureAtlasRegion.lua b/spine-lua/TextureAtlasRegion.lua
index 945fffb71..c347f1245 100644
--- a/spine-lua/TextureAtlasRegion.lua
+++ b/spine-lua/TextureAtlasRegion.lua
@@ -46,7 +46,7 @@ function TextureAtlasRegion.new ()
 	self.rotate = false
 	self.texture = nil
 	setmetatable(self, TextureAtlasRegion)
-	
+
 	return self
 end
 
diff --git a/spine-lua/TextureRegion.lua b/spine-lua/TextureRegion.lua
index 4c67a7fc3..ec2ae026c 100644
--- a/spine-lua/TextureRegion.lua
+++ b/spine-lua/TextureRegion.lua
@@ -45,7 +45,7 @@ function TextureRegion.new ()
 		originalWidth = 0, originalHeight = 0
 	}
 	setmetatable(self, TextureRegion)
-	
+
 	return self
 end
 
diff --git a/spine-lua/TransformConstraint.lua b/spine-lua/TransformConstraint.lua
index f538753c3..a6ed8b4b3 100644
--- a/spine-lua/TransformConstraint.lua
+++ b/spine-lua/TransformConstraint.lua
@@ -56,7 +56,7 @@ function TransformConstraint.new (data, skeleton)
 		temp = { 0, 0 }
 	}
 	setmetatable(self, TransformConstraint)
-	
+
 	for i,bone in ipairs(data.bones) do
 		table_insert(self.bones, skeleton:findBone(bone.name))
 	end
@@ -77,7 +77,7 @@ function TransformConstraint:update ()
 	local target = self.target
 	local ta = target.a
 	local tb = target.b
-	local tc = target.c 
+	local tc = target.c
 	local td = target.d
 	local bones = self.bones
 	for i, bone in ipairs(bones) do
diff --git a/spine-lua/attachments/Attachment.lua b/spine-lua/attachments/Attachment.lua
index 1bd1c425d..f82a8b15b 100644
--- a/spine-lua/attachments/Attachment.lua
+++ b/spine-lua/attachments/Attachment.lua
@@ -36,15 +36,15 @@ local Attachment = {}
 Attachment.__index = Attachment
 
 function Attachment.new (name, attachmentType)
-  if not name then error("name cannot be nil.", 2) end
-  if not attachmentType then error("attachmentType cannot be nil.", 2) end
-  
-  local self = {
-    name = name,
-    type = attachmentType
-  }
-  setmetatable(self, Attachment)
-  return self
+	if not name then error("name cannot be nil.", 2) end
+	if not attachmentType then error("attachmentType cannot be nil.", 2) end
+
+	local self = {
+		name = name,
+		type = attachmentType
+	}
+	setmetatable(self, Attachment)
+	return self
 end
 
 return Attachment
diff --git a/spine-lua/attachments/AttachmentType.lua b/spine-lua/attachments/AttachmentType.lua
index d4254cc0f..2760271af 100644
--- a/spine-lua/attachments/AttachmentType.lua
+++ b/spine-lua/attachments/AttachmentType.lua
@@ -32,7 +32,7 @@ local AttachmentType = {
 	region = 0,
 	boundingbox = 1,
 	mesh = 2,
-  linkedmesh = 3,
-  path = 4
+	linkedmesh = 3,
+	path = 4
 }
 return AttachmentType
diff --git a/spine-lua/attachments/BoundingBoxAttachment.lua b/spine-lua/attachments/BoundingBoxAttachment.lua
index ac262099d..53a9f3ad8 100644
--- a/spine-lua/attachments/BoundingBoxAttachment.lua
+++ b/spine-lua/attachments/BoundingBoxAttachment.lua
@@ -40,8 +40,8 @@ function BoundingBoxAttachment.new (name)
 	if not name then error("name cannot be nil", 2) end
 
 	local self = VertexAttachment.new(name, AttachmentType.boundingbox)
-  self.color = Color.newWith(1, 1, 1, 1)
-  setmetatable(self, BoundingBoxAttachment)
+	self.color = Color.newWith(1, 1, 1, 1)
+	setmetatable(self, BoundingBoxAttachment)
 	return self
 end
 return BoundingBoxAttachment
diff --git a/spine-lua/attachments/MeshAttachment.lua b/spine-lua/attachments/MeshAttachment.lua
index a0373a91c..ebaf810f8 100644
--- a/spine-lua/attachments/MeshAttachment.lua
+++ b/spine-lua/attachments/MeshAttachment.lua
@@ -42,191 +42,191 @@ function MeshAttachment.new (name)
 	if not name then error("name cannot be nil", 2) end
 
 	local self = VertexAttachment.new(name, AttachmentType.mesh)
-  self.region = nil
-  self.path = nil
-  self.regionUVs = nil
-  self.worldVertices = nil
-  self.triangles = nil
-  self.color = Color.newWith(1, 1, 1, 1)
-  self.hullLength = 0
-  self.parentMesh = nil
-  self.inheritDeform = false
-  self.tempColor = Color.newWith(1, 1, 1, 1)
-  setmetatable(self, MeshAttachment)
+	self.region = nil
+	self.path = nil
+	self.regionUVs = nil
+	self.worldVertices = nil
+	self.triangles = nil
+	self.color = Color.newWith(1, 1, 1, 1)
+	self.hullLength = 0
+	self.parentMesh = nil
+	self.inheritDeform = false
+	self.tempColor = Color.newWith(1, 1, 1, 1)
+	setmetatable(self, MeshAttachment)
 	return self
 end
 
 function MeshAttachment:updateUVs ()
-  local regionUVs = self.regionUVs
-  local verticesLength = #regionUVs
-  local worldVerticesLength = (verticesLength / 2) * 8
-  if not self.worldVertices or #self.worldVertices ~= worldVerticesLength then
-    self.worldVertices = utils.newNumberArray(worldVerticesLength)
-  end
+	local regionUVs = self.regionUVs
+	local verticesLength = #regionUVs
+	local worldVerticesLength = (verticesLength / 2) * 8
+	if not self.worldVertices or #self.worldVertices ~= worldVerticesLength then
+		self.worldVertices = utils.newNumberArray(worldVerticesLength)
+	end
 
-  local u = 0
-  local v = 0
-  local width = 0
-  local height = 0
-  if not self.region then
-    u = 0
-    v = 0
-    width = 1
-    height = 1
-  else
-    u = self.region.u;
-    v = self.region.v;
-    width = self.region.u2 - u;
-    height = self.region.v2 - v;
-  end
-  if self.region and self.region.rotate then
-    local i = 0
-    local w = 2
-    while i < verticesLength do
-      self.worldVertices[w + 1] = u + regionUVs[i + 2] * width;
-      self.worldVertices[w + 2] = v + height - regionUVs[i + 1] * height;
-      i = i + 2
-      w = w + 8
-    end
-  else
-    local i = 0
-    local w = 2
-    while i < verticesLength do
-      self.worldVertices[w + 1] = u + regionUVs[i + 1] * width;
-      self.worldVertices[w + 2] = v + regionUVs[i + 2] * height;
-      i = i + 2
-      w = w + 8
-    end
-  end
+	local u = 0
+	local v = 0
+	local width = 0
+	local height = 0
+	if not self.region then
+		u = 0
+		v = 0
+		width = 1
+		height = 1
+	else
+		u = self.region.u;
+		v = self.region.v;
+		width = self.region.u2 - u;
+		height = self.region.v2 - v;
+	end
+	if self.region and self.region.rotate then
+		local i = 0
+		local w = 2
+		while i < verticesLength do
+			self.worldVertices[w + 1] = u + regionUVs[i + 2] * width;
+			self.worldVertices[w + 2] = v + height - regionUVs[i + 1] * height;
+			i = i + 2
+			w = w + 8
+		end
+	else
+		local i = 0
+		local w = 2
+		while i < verticesLength do
+			self.worldVertices[w + 1] = u + regionUVs[i + 1] * width;
+			self.worldVertices[w + 2] = v + regionUVs[i + 2] * height;
+			i = i + 2
+			w = w + 8
+		end
+	end
 end
 
 function MeshAttachment:updateWorldVertices(slot, premultipliedAlpha)
-  local skeleton = slot.bone.skeleton
-  local skeletonColor = skeleton.color
-  local slotColor = slot.color
-  local meshColor = self.color
-  
-  local alpha = skeletonColor.a * slotColor.a * meshColor.a
-  local multiplier = 1
-  if premultipliedAlpha then multiplier = alpha end
-  local color = self.tempColor
-  color:set(skeletonColor.r * slotColor.r * meshColor.r * multiplier,
-    skeletonColor.g * slotColor.g * meshColor.g * multiplier,
-    skeletonColor.b * slotColor.b * meshColor.b * multiplier,
-    alpha)
+	local skeleton = slot.bone.skeleton
+	local skeletonColor = skeleton.color
+	local slotColor = slot.color
+	local meshColor = self.color
 
-  local x = skeleton.x
-  local y = skeleton.y
-  local deformArray = slot.attachmentVertices
-  local vertices = self.vertices
-  local worldVertices = self.worldVertices
-  local bones = self.bones
-  if not bones then
-    local verticesLength = #vertices
-    if #deformArray > 0 then vertices = deformArray end
-    local bone = slot.bone;
-    x = x + bone.worldX
-    y = y + bone.worldY
-    local a = bone.a
-    local b = bone.b
-    local c = bone.c
-    local d = bone.d
-    local v = 0
-    local w = 0
-    while v < verticesLength do
-      local vx = vertices[v + 1]
-      local vy = vertices[v + 2]
-      worldVertices[w + 1] = vx * a + vy * b + x
-      worldVertices[w + 2] = vx * c + vy * d + y
-      worldVertices[w + 5] = color.r
-      worldVertices[w + 6] = color.g
-      worldVertices[w + 7] = color.b
-      worldVertices[w + 8] = color.a
-      v = v + 2
-      w = w + 8
-    end
-    return worldVertices
-  end
-  
-  local skeletonBones = skeleton.bones
-  if #deformArray == 0 then
-    local w = 0
-    local v = 0
-    local b = 0
-    local n = #bones
-    while v < n do
-      local wx = x
-      local wy = y
-      local nn = bones[v + 1];
-      v = v + 1
-      nn = nn + v
-      while v < nn do
-        local bone = skeletonBones[bones[v + 1]];
-        local vx = vertices[b + 1]
-        local vy = vertices[b + 2]
-        local weight = vertices[b + 3]
-        wx = wx + (vx * bone.a + vy * bone.b + bone.worldX) * weight
-        wy = wy + (vx * bone.c + vy * bone.d + bone.worldY) * weight
-        v = v + 1
-        b = b + 3
-      end
-      worldVertices[w + 1] = wx
-      worldVertices[w + 2] = wy
-      worldVertices[w + 5] = color.r
-      worldVertices[w + 6] = color.g
-      worldVertices[w + 7] = color.b
-      worldVertices[w + 8] = color.a
-      w = w + 8
-    end
-  else
-    local deform = deformArray;
-    local w = 0
-    local v = 0
-    local b = 0
-    local f = 0
-    local n = #bones
-    while v < n do
-      local wx = x
-      local wy = y
-      local nn = bones[v + 1]
-      v = v + 1
-      nn = nn + v
-      while v < nn do
-        local bone = skeletonBones[bones[v + 1]];
-        local vx = vertices[b + 1] + deform[f + 1]
-        local vy = vertices[b + 2] + deform[f + 2]
-        local weight = vertices[b + 3]
-        wx = wx + (vx * bone.a + vy * bone.b + bone.worldX) * weight
-        wy = wy + (vx * bone.c + vy * bone.d + bone.worldY) * weight
-        b = b + 3
-        f = f + 2
-        v = v + 1
-      end
-      worldVertices[w + 1] = wx;
-      worldVertices[w + 2] = wy;
-      worldVertices[w + 5] = color.r;
-      worldVertices[w + 6] = color.g;
-      worldVertices[w + 7] = color.b;
-      worldVertices[w + 8] = color.a;
-      w = w + 8
-    end
-  end
-  return worldVertices;
+	local alpha = skeletonColor.a * slotColor.a * meshColor.a
+	local multiplier = 1
+	if premultipliedAlpha then multiplier = alpha end
+	local color = self.tempColor
+	color:set(skeletonColor.r * slotColor.r * meshColor.r * multiplier,
+		skeletonColor.g * slotColor.g * meshColor.g * multiplier,
+		skeletonColor.b * slotColor.b * meshColor.b * multiplier,
+		alpha)
+
+	local x = skeleton.x
+	local y = skeleton.y
+	local deformArray = slot.attachmentVertices
+	local vertices = self.vertices
+	local worldVertices = self.worldVertices
+	local bones = self.bones
+	if not bones then
+		local verticesLength = #vertices
+		if #deformArray > 0 then vertices = deformArray end
+		local bone = slot.bone;
+		x = x + bone.worldX
+		y = y + bone.worldY
+		local a = bone.a
+		local b = bone.b
+		local c = bone.c
+		local d = bone.d
+		local v = 0
+		local w = 0
+		while v < verticesLength do
+			local vx = vertices[v + 1]
+			local vy = vertices[v + 2]
+			worldVertices[w + 1] = vx * a + vy * b + x
+			worldVertices[w + 2] = vx * c + vy * d + y
+			worldVertices[w + 5] = color.r
+			worldVertices[w + 6] = color.g
+			worldVertices[w + 7] = color.b
+			worldVertices[w + 8] = color.a
+			v = v + 2
+			w = w + 8
+		end
+		return worldVertices
+	end
+
+	local skeletonBones = skeleton.bones
+	if #deformArray == 0 then
+		local w = 0
+		local v = 0
+		local b = 0
+		local n = #bones
+		while v < n do
+			local wx = x
+			local wy = y
+			local nn = bones[v + 1];
+			v = v + 1
+			nn = nn + v
+			while v < nn do
+				local bone = skeletonBones[bones[v + 1]];
+				local vx = vertices[b + 1]
+				local vy = vertices[b + 2]
+				local weight = vertices[b + 3]
+				wx = wx + (vx * bone.a + vy * bone.b + bone.worldX) * weight
+				wy = wy + (vx * bone.c + vy * bone.d + bone.worldY) * weight
+				v = v + 1
+				b = b + 3
+			end
+			worldVertices[w + 1] = wx
+			worldVertices[w + 2] = wy
+			worldVertices[w + 5] = color.r
+			worldVertices[w + 6] = color.g
+			worldVertices[w + 7] = color.b
+			worldVertices[w + 8] = color.a
+			w = w + 8
+		end
+	else
+		local deform = deformArray;
+		local w = 0
+		local v = 0
+		local b = 0
+		local f = 0
+		local n = #bones
+		while v < n do
+			local wx = x
+			local wy = y
+			local nn = bones[v + 1]
+			v = v + 1
+			nn = nn + v
+			while v < nn do
+				local bone = skeletonBones[bones[v + 1]];
+				local vx = vertices[b + 1] + deform[f + 1]
+				local vy = vertices[b + 2] + deform[f + 2]
+				local weight = vertices[b + 3]
+				wx = wx + (vx * bone.a + vy * bone.b + bone.worldX) * weight
+				wy = wy + (vx * bone.c + vy * bone.d + bone.worldY) * weight
+				b = b + 3
+				f = f + 2
+				v = v + 1
+			end
+			worldVertices[w + 1] = wx;
+			worldVertices[w + 2] = wy;
+			worldVertices[w + 5] = color.r;
+			worldVertices[w + 6] = color.g;
+			worldVertices[w + 7] = color.b;
+			worldVertices[w + 8] = color.a;
+			w = w + 8
+		end
+	end
+	return worldVertices;
 end
 
 function MeshAttachment:applyDeform (sourceAttachment)
-  return self == sourceAttachment or (self.inheritDeform and self.parentMesh == sourceAttachment)
+	return self == sourceAttachment or (self.inheritDeform and self.parentMesh == sourceAttachment)
 end
 
 function MeshAttachment:setParentMesh (parentMesh)
-  self.parentMesh = parentMesh
-  if parentMesh then
-    self.bones = parentMesh.bones
-    self.vertices = parentMesh.vertices
-    self.regionUVs = parentMesh.regionUVs
-    self.triangles = parentMesh.triangles
-    self.hullLength = parentMesh.hullLength
-  end
+	self.parentMesh = parentMesh
+	if parentMesh then
+		self.bones = parentMesh.bones
+		self.vertices = parentMesh.vertices
+		self.regionUVs = parentMesh.regionUVs
+		self.triangles = parentMesh.triangles
+		self.hullLength = parentMesh.hullLength
+	end
 end
 
 return MeshAttachment
diff --git a/spine-lua/attachments/PathAttachment.lua b/spine-lua/attachments/PathAttachment.lua
index 28b3fc340..ea8092305 100644
--- a/spine-lua/attachments/PathAttachment.lua
+++ b/spine-lua/attachments/PathAttachment.lua
@@ -40,9 +40,9 @@ function PathAttachment.new (name)
 	if not name then error("name cannot be nil", 2) end
 
 	local self = VertexAttachment.new(name, AttachmentType.path)
-  self.lengths = nil
-  self.color = Color.newWith(1, 1, 1, 1)
-  setmetatable(self, PathAttachment)
+	self.lengths = nil
+	self.color = Color.newWith(1, 1, 1, 1)
+	setmetatable(self, PathAttachment)
 	return self
 end
 return PathAttachment
diff --git a/spine-lua/attachments/RegionAttachment.lua b/spine-lua/attachments/RegionAttachment.lua
index 2d57529a5..b3e2a0b91 100644
--- a/spine-lua/attachments/RegionAttachment.lua
+++ b/spine-lua/attachments/RegionAttachment.lua
@@ -89,142 +89,142 @@ setmetatable(RegionAttachment, { __index = Attachment })
 
 function RegionAttachment.new (name)
 	if not name then error("name cannot be nil", 2) end
-	
-	local self = Attachment.new(name, AttachmentType.region)  
-  self.x = 0
-  self.y = 0
-  self.scaleX = 1
-  self.scaleY = 1
-  self.rotation = 0
-  self.width = 0
-  self.height = 0
-  self.color = Color.newWith(1, 1, 1, 1)
-  self.path = nil
-  self.rendererObject = nil
-  self.region = nil
-  self.offset = Utils.newNumberArray(8)
-  self.vertices = Utils.newNumberArray(8 * 4)
-  self.tempColor = Color.newWith(1, 1, 1, 1)
+
+	local self = Attachment.new(name, AttachmentType.region)
+	self.x = 0
+	self.y = 0
+	self.scaleX = 1
+	self.scaleY = 1
+	self.rotation = 0
+	self.width = 0
+	self.height = 0
+	self.color = Color.newWith(1, 1, 1, 1)
+	self.path = nil
+	self.rendererObject = nil
+	self.region = nil
+	self.offset = Utils.newNumberArray(8)
+	self.vertices = Utils.newNumberArray(8 * 4)
+	self.tempColor = Color.newWith(1, 1, 1, 1)
 	setmetatable(self, RegionAttachment)
-	
+
 	return self
 end
 
 function RegionAttachment:setRegion (region)
-  local vertices = self.vertices
-  if region.rotate then
-    vertices[U2] = region.u
-    vertices[V2] = region.v2
-    vertices[U3] = region.u
-    vertices[V3] = region.v
-    vertices[U4] = region.u2
-    vertices[V4] = region.v
-    vertices[U1] = region.u2
-    vertices[V1] = region.v2
-  else
-    vertices[U1] = region.u
-    vertices[V1] = region.v2
-    vertices[U2] = region.u
-    vertices[V2] = region.v
-    vertices[U3] = region.u2
-    vertices[V3] = region.v
-    vertices[U4] = region.u2
-    vertices[V4] = region.v2
-  end
+	local vertices = self.vertices
+	if region.rotate then
+		vertices[U2] = region.u
+		vertices[V2] = region.v2
+		vertices[U3] = region.u
+		vertices[V3] = region.v
+		vertices[U4] = region.u2
+		vertices[V4] = region.v
+		vertices[U1] = region.u2
+		vertices[V1] = region.v2
+	else
+		vertices[U1] = region.u
+		vertices[V1] = region.v2
+		vertices[U2] = region.u
+		vertices[V2] = region.v
+		vertices[U3] = region.u2
+		vertices[V3] = region.v
+		vertices[U4] = region.u2
+		vertices[V4] = region.v2
+	end
 end
 
 function RegionAttachment:updateOffset ()
-  local regionScaleX = self.width / self.region.originalWidth * self.scaleX
-  local regionScaleY = self.height / self.region.originalHeight * self.scaleY
-  local localX = -self.width / 2 * self.scaleX + self.region.offsetX * regionScaleX
-  local localY = -self.height / 2 * self.scaleY + self.region.offsetY * regionScaleY
-  local localX2 = localX + self.region.width * regionScaleX
-  local localY2 = localY + self.region.height * regionScaleY
-  local radians = self.rotation * math_pi / 180
-  local cos = math_cos(radians)
-  local sin = math_sin(radians)
-  local localXCos = localX * cos + self.x
-  local localXSin = localX * sin
-  local localYCos = localY * cos + self.y
-  local localYSin = localY * sin
-  local localX2Cos = localX2 * cos + self.x
-  local localX2Sin = localX2 * sin
-  local localY2Cos = localY2 * cos + self.y
-  local localY2Sin = localY2 * sin
-  local offset = self.offset
-  offset[OX1] = localXCos - localYSin
-  offset[OY1] = localYCos + localXSin
-  offset[OX2] = localXCos - localY2Sin
-  offset[OY2] = localY2Cos + localXSin
-  offset[OX3] = localX2Cos - localY2Sin
-  offset[OY3] = localY2Cos + localX2Sin
-  offset[OX4] = localX2Cos - localYSin
-  offset[OY4] = localYCos + localX2Sin
+	local regionScaleX = self.width / self.region.originalWidth * self.scaleX
+	local regionScaleY = self.height / self.region.originalHeight * self.scaleY
+	local localX = -self.width / 2 * self.scaleX + self.region.offsetX * regionScaleX
+	local localY = -self.height / 2 * self.scaleY + self.region.offsetY * regionScaleY
+	local localX2 = localX + self.region.width * regionScaleX
+	local localY2 = localY + self.region.height * regionScaleY
+	local radians = self.rotation * math_pi / 180
+	local cos = math_cos(radians)
+	local sin = math_sin(radians)
+	local localXCos = localX * cos + self.x
+	local localXSin = localX * sin
+	local localYCos = localY * cos + self.y
+	local localYSin = localY * sin
+	local localX2Cos = localX2 * cos + self.x
+	local localX2Sin = localX2 * sin
+	local localY2Cos = localY2 * cos + self.y
+	local localY2Sin = localY2 * sin
+	local offset = self.offset
+	offset[OX1] = localXCos - localYSin
+	offset[OY1] = localYCos + localXSin
+	offset[OX2] = localXCos - localY2Sin
+	offset[OY2] = localY2Cos + localXSin
+	offset[OX3] = localX2Cos - localY2Sin
+	offset[OY3] = localY2Cos + localX2Sin
+	offset[OX4] = localX2Cos - localYSin
+	offset[OY4] = localYCos + localX2Sin
 end
 
 function RegionAttachment:updateWorldVertices (slot, premultipliedAlpha)
-  local skeleton = slot.bone.skeleton
-  local skeletonColor = skeleton.color
-  local slotColor = slot.color
-  local regionColor = self.color
-  local alpha = skeletonColor.a * slotColor.a * regionColor.a
-  local multiplier = alpha
-  if premultipliedAlpha then multiplier = 1 end
-  local color = self.tempColor
-  color:set(skeletonColor.r * slotColor.r * regionColor.r * multiplier,
-    skeletonColor.g * slotColor.g * regionColor.g * multiplier,
-    skeletonColor.b * slotColor.b * regionColor.b * multiplier,
-    alpha)
+	local skeleton = slot.bone.skeleton
+	local skeletonColor = skeleton.color
+	local slotColor = slot.color
+	local regionColor = self.color
+	local alpha = skeletonColor.a * slotColor.a * regionColor.a
+	local multiplier = alpha
+	if premultipliedAlpha then multiplier = 1 end
+	local color = self.tempColor
+	color:set(skeletonColor.r * slotColor.r * regionColor.r * multiplier,
+		skeletonColor.g * slotColor.g * regionColor.g * multiplier,
+		skeletonColor.b * slotColor.b * regionColor.b * multiplier,
+		alpha)
 
-  local vertices = self.vertices
-  local offset = self.offset
-  local bone = slot.bone
-  local x = skeleton.x + bone.worldX
-  local y = skeleton.y + bone.worldY
-  local a = bone.a
-  local b = bone.b
-  local c = bone.c
-  local d = bone.d
-  local offsetX = 0
-  local offsetY = 0
+	local vertices = self.vertices
+	local offset = self.offset
+	local bone = slot.bone
+	local x = skeleton.x + bone.worldX
+	local y = skeleton.y + bone.worldY
+	local a = bone.a
+	local b = bone.b
+	local c = bone.c
+	local d = bone.d
+	local offsetX = 0
+	local offsetY = 0
 
-  offsetX = offset[OX1]
-  offsetY = offset[OY1]
-  vertices[X1] = offsetX * a + offsetY * b + x -- br
-  vertices[Y1] = offsetX * c + offsetY * d + y
-  vertices[C1R] = color.r
-  vertices[C1G] = color.g
-  vertices[C1B] = color.b
-  vertices[C1A] = color.a
+	offsetX = offset[OX1]
+	offsetY = offset[OY1]
+	vertices[X1] = offsetX * a + offsetY * b + x -- br
+	vertices[Y1] = offsetX * c + offsetY * d + y
+	vertices[C1R] = color.r
+	vertices[C1G] = color.g
+	vertices[C1B] = color.b
+	vertices[C1A] = color.a
 
-  offsetX = offset[OX2]
-  offsetY = offset[OY2]
-  vertices[X2] = offsetX * a + offsetY * b + x -- bl
-  vertices[Y2] = offsetX * c + offsetY * d + y
-  vertices[C2R] = color.r
-  vertices[C2G] = color.g
-  vertices[C2B] = color.b
-  vertices[C2A] = color.a
+	offsetX = offset[OX2]
+	offsetY = offset[OY2]
+	vertices[X2] = offsetX * a + offsetY * b + x -- bl
+	vertices[Y2] = offsetX * c + offsetY * d + y
+	vertices[C2R] = color.r
+	vertices[C2G] = color.g
+	vertices[C2B] = color.b
+	vertices[C2A] = color.a
 
-  offsetX = offset[OX3]
-  offsetY = offset[OY3]
-  vertices[X3] = offsetX * a + offsetY * b + x -- ul
-  vertices[Y3] = offsetX * c + offsetY * d + y
-  vertices[C3R] = color.r
-  vertices[C3G] = color.g
-  vertices[C3B] = color.b
-  vertices[C3A] = color.a
+	offsetX = offset[OX3]
+	offsetY = offset[OY3]
+	vertices[X3] = offsetX * a + offsetY * b + x -- ul
+	vertices[Y3] = offsetX * c + offsetY * d + y
+	vertices[C3R] = color.r
+	vertices[C3G] = color.g
+	vertices[C3B] = color.b
+	vertices[C3A] = color.a
 
-  offsetX = offset[OX4]
-  offsetY = offset[OY4]
-  vertices[X4] = offsetX * a + offsetY * b + x -- ur
-  vertices[Y4] = offsetX * c + offsetY * d + y
-  vertices[C4R] = color.r
-  vertices[C4G] = color.g
-  vertices[C4B] = color.b
-  vertices[C4A] = color.a
+	offsetX = offset[OX4]
+	offsetY = offset[OY4]
+	vertices[X4] = offsetX * a + offsetY * b + x -- ur
+	vertices[Y4] = offsetX * c + offsetY * d + y
+	vertices[C4R] = color.r
+	vertices[C4G] = color.g
+	vertices[C4B] = color.b
+	vertices[C4A] = color.a
 
-  return vertices		
+	return vertices
 end
 
 return RegionAttachment
diff --git a/spine-lua/attachments/VertexAttachment.lua b/spine-lua/attachments/VertexAttachment.lua
index 54c69efac..6372364c2 100644
--- a/spine-lua/attachments/VertexAttachment.lua
+++ b/spine-lua/attachments/VertexAttachment.lua
@@ -29,7 +29,7 @@
 -------------------------------------------------------------------------------
 
 -- FIXME the logic in this file uses 0-based indexing. Each array
--- access adds 1 to the calculated index. We should switch the logic 
+-- access adds 1 to the calculated index. We should switch the logic
 -- to 1-based indexing eventually.
 
 local setmetatable = setmetatable
@@ -42,112 +42,112 @@ VertexAttachment.__index = VertexAttachment
 setmetatable(VertexAttachment, { __index = Attachment })
 
 function VertexAttachment.new (name, attachmentType)
-  local self = Attachment.new(name, attachmentType)
-  self.bones = nil
-  self.vertices = nil
-  self.worldVerticesLength = 0
-  setmetatable(self, VertexAttachment)
-  return self
+	local self = Attachment.new(name, attachmentType)
+	self.bones = nil
+	self.vertices = nil
+	self.worldVerticesLength = 0
+	setmetatable(self, VertexAttachment)
+	return self
 end
 
 function VertexAttachment:computeWorldVertices (slot, worldVertices)
-  self:computeWorldVerticesWith(slot, 0, self.worldVerticesLength, worldVertices, 0)
+	self:computeWorldVerticesWith(slot, 0, self.worldVerticesLength, worldVertices, 0)
 end
 
 function VertexAttachment:computeWorldVerticesWith (slot, start, count, worldVertices, offset)
-  count = count + offset
-  local skeleton = slot.bone.skeleton
-  local x = skeleton.x
-  local y = skeleton.y
-  local deformArray = slot.attachmentVertices
-  local vertices = self.vertices
-  local bones = self.bones
-  if not bones then
-    if #deformArray > 0 then vertices = deformArray end
-    local bone = slot.bone
-    x = x + bone.worldX
-    y = y + bone.worldY
-    local a = bone.a
-    local b = bone.b
-    local c = bone.c
-    local d = bone.d
-    local v = start
-    local w = offset
-    while  w < count do
-      local vx = vertices[v + 1]
-      local vy = vertices[v + 2]
-      worldVertices[w + 1] = vx * a + vy * b + x
-      worldVertices[w + 2] = vx * c + vy * d + y
-      v = v + 2
-      w = w + 2
-    end
-    return
-  end
-  local v = 0
-  local skip = 0
-  local i = 0
-  while i < start do
-    local n = bones[v + 1]
-    v = v + n + 1
-    skip = skip + n
-    i = i + 2
-  end
-  local skeletonBones = skeleton.bones
-  if #deformArray == 0 then
-    local w = offset
-    local b = skip * 3
-    while w < count do
-      local wx = x
-      local wy = y
-      local n = bones[v + 1]
-      v = v + 1
-      n = n + v
-      while v < n do
-        local bone = skeletonBones[bones[v + 1]]
-        local vx = vertices[b + 1]
-        local vy = vertices[b + 2]
-        local weight = vertices[b + 3]
-        wx = wx + (vx * bone.a + vy * bone.b + bone.worldX) * weight
-        wy = wy + (vx * bone.c + vy * bone.d + bone.worldY) * weight
-        v = v + 1
-        b = b + 3
-      end
-      worldVertices[w + 1] = wx
-      worldVertices[w + 2] = wy
-      w = w + 2
-    end
-  else
-    local deform = deformArray
-    local w = offset
-    local b = skip * 3
-    local f = skip * 2
-    while w < count do
-      local wx = x
-      local wy = y
-      local n = bones[v + 1]
-      v = v + 1
-      n = n + v
-      
-      while v < n do
-        local bone = skeletonBones[bones[v + 1]]
-        local vx = vertices[b + 1] + deform[f + 1]
-        local vy = vertices[b + 2] + deform[f + 2]
-        local weight = vertices[b + 3]
-        wx = wx + (vx * bone.a + vy * bone.b + bone.worldX) * weight
-        wy = wy + (vx * bone.c + vy * bone.d + bone.worldY) * weight
-        v = v + 1
-        b = b + 3
-        f = f + 2
-      end
-      worldVertices[w + 1] = wx
-      worldVertices[w + 2] = wy
-      w = w + 2
-    end
-  end
+	count = count + offset
+	local skeleton = slot.bone.skeleton
+	local x = skeleton.x
+	local y = skeleton.y
+	local deformArray = slot.attachmentVertices
+	local vertices = self.vertices
+	local bones = self.bones
+	if not bones then
+		if #deformArray > 0 then vertices = deformArray end
+		local bone = slot.bone
+		x = x + bone.worldX
+		y = y + bone.worldY
+		local a = bone.a
+		local b = bone.b
+		local c = bone.c
+		local d = bone.d
+		local v = start
+		local w = offset
+		while w < count do
+			local vx = vertices[v + 1]
+			local vy = vertices[v + 2]
+			worldVertices[w + 1] = vx * a + vy * b + x
+			worldVertices[w + 2] = vx * c + vy * d + y
+			v = v + 2
+			w = w + 2
+		end
+		return
+	end
+	local v = 0
+	local skip = 0
+	local i = 0
+	while i < start do
+		local n = bones[v + 1]
+		v = v + n + 1
+		skip = skip + n
+		i = i + 2
+	end
+	local skeletonBones = skeleton.bones
+	if #deformArray == 0 then
+		local w = offset
+		local b = skip * 3
+		while w < count do
+			local wx = x
+			local wy = y
+			local n = bones[v + 1]
+			v = v + 1
+			n = n + v
+			while v < n do
+				local bone = skeletonBones[bones[v + 1]]
+				local vx = vertices[b + 1]
+				local vy = vertices[b + 2]
+				local weight = vertices[b + 3]
+				wx = wx + (vx * bone.a + vy * bone.b + bone.worldX) * weight
+				wy = wy + (vx * bone.c + vy * bone.d + bone.worldY) * weight
+				v = v + 1
+				b = b + 3
+			end
+			worldVertices[w + 1] = wx
+			worldVertices[w + 2] = wy
+			w = w + 2
+		end
+	else
+		local deform = deformArray
+		local w = offset
+		local b = skip * 3
+		local f = skip * 2
+		while w < count do
+			local wx = x
+			local wy = y
+			local n = bones[v + 1]
+			v = v + 1
+			n = n + v
+
+			while v < n do
+				local bone = skeletonBones[bones[v + 1]]
+				local vx = vertices[b + 1] + deform[f + 1]
+				local vy = vertices[b + 2] + deform[f + 2]
+				local weight = vertices[b + 3]
+				wx = wx + (vx * bone.a + vy * bone.b + bone.worldX) * weight
+				wy = wy + (vx * bone.c + vy * bone.d + bone.worldY) * weight
+				v = v + 1
+				b = b + 3
+				f = f + 2
+			end
+			worldVertices[w + 1] = wx
+			worldVertices[w + 2] = wy
+			w = w + 2
+		end
+	end
 end
 
 function VertexAttachment:applyDeform (sourceAttachment)
-  return self == sourceAttachment
+	return self == sourceAttachment
 end
 
 return VertexAttachment
diff --git a/spine-lua/utils.lua b/spine-lua/utils.lua
index e73dbb825..3eeb70318 100644
--- a/spine-lua/utils.lua
+++ b/spine-lua/utils.lua
@@ -80,8 +80,8 @@ end
 function utils.newNumberArray (size)
 	local a = {}
 	local i = 1
-	while i <= size do 
-		a[i] = 0 
+	while i <= size do
+		a[i] = 0
 		i = i + 1
 	end
 	return a
@@ -90,8 +90,8 @@ end
 function utils.newNumberArrayZero (size)
 	local a = {}
 	local i = 0
-	while i < size do 
-		a[i] = 0 
+	while i < size do
+		a[i] = 0
 		i = i + 1
 	end
 	return a
@@ -101,7 +101,7 @@ function utils.setArraySize (array, size)
 	if #array == size then return array end
 	if #array < size then
 		local i = #array + 1
-		while i <= size do 
+		while i <= size do
 			array[i] = 0
 			i = i + 1
 		end
diff --git a/spine-sfml/src/spine/spine-sfml.cpp b/spine-sfml/src/spine/spine-sfml.cpp
index 717ef6fb2..a84cb802d 100644
--- a/spine-sfml/src/spine/spine-sfml.cpp
+++ b/spine-sfml/src/spine/spine-sfml.cpp
@@ -62,9 +62,9 @@ char* _Util_readFile (const char* path, int* length){
 namespace spine {
 
 SkeletonDrawable::SkeletonDrawable (SkeletonData* skeletonData, AnimationStateData* stateData) :
-				timeScale(1),
-				vertexArray(new VertexArray(Triangles, skeletonData->bonesCount * 4)),
-				worldVertices(0) {
+		timeScale(1),
+		vertexArray(new VertexArray(Triangles, skeletonData->bonesCount * 4)),
+		worldVertices(0) {
 	Bone_setYDown(true);
 	worldVertices = MALLOC(float, SPINE_MESH_VERTEX_COUNT_MAX);
 	skeleton = Skeleton_create(skeletonData);
@@ -78,7 +78,7 @@ SkeletonDrawable::SkeletonDrawable (SkeletonData* skeletonData, AnimationStateDa
 SkeletonDrawable::~SkeletonDrawable () {
 	delete vertexArray;
 	FREE(worldVertices);
-    if (ownsAnimationStateData) AnimationStateData_dispose(state->data);
+	if (ownsAnimationStateData) AnimationStateData_dispose(state->data);
 	AnimationState_dispose(state);
 	Skeleton_dispose(skeleton);
 }
diff --git a/spine-starling/spine-starling/src/spine/starling/SkeletonAnimation.as b/spine-starling/spine-starling/src/spine/starling/SkeletonAnimation.as
index a8d89da39..836ddea3f 100644
--- a/spine-starling/spine-starling/src/spine/starling/SkeletonAnimation.as
+++ b/spine-starling/spine-starling/src/spine/starling/SkeletonAnimation.as
@@ -38,7 +38,7 @@ import starling.animation.IAnimatable;
 public class SkeletonAnimation extends SkeletonSprite implements IAnimatable {
 	public var state:AnimationState;
 	public var timeScale:Number = 1;
-	
+
 	public function SkeletonAnimation (skeletonData:SkeletonData, stateData:AnimationStateData = null) {
 		super(skeletonData);
 		state = new AnimationState(stateData ? stateData : new AnimationStateData(skeletonData));
diff --git a/spine-starling/spine-starling/src/spine/starling/SkeletonMesh.as b/spine-starling/spine-starling/src/spine/starling/SkeletonMesh.as
index 91dc8f173..44c920b0a 100644
--- a/spine-starling/spine-starling/src/spine/starling/SkeletonMesh.as
+++ b/spine-starling/spine-starling/src/spine/starling/SkeletonMesh.as
@@ -36,16 +36,16 @@ import starling.rendering.VertexData;
 import starling.display.Mesh;
 
 public class SkeletonMesh extends Mesh {
-	
+
 	public function SkeletonMesh(texture:Texture, vertexData:VertexData = null, indexData:IndexData = null, style:MeshStyle=null) {
-        super(vertexData == null? new VertexData(): vertexData, indexData == null? new IndexData(): indexData, style);
+		super(vertexData == null? new VertexData(): vertexData, indexData == null? new IndexData(): indexData, style);
 		this.texture = texture;
-    }
-	
+	}
+
 	public function getVertexData(): VertexData {
 		return this.vertexData;
 	}
-	
+
 	public function getIndexData(): IndexData {
 		return this.indexData;
 	}
diff --git a/spine-starling/spine-starling/src/spine/starling/SkeletonSprite.as b/spine-starling/spine-starling/src/spine/starling/SkeletonSprite.as
index 467bbdb25..467585bbd 100644
--- a/spine-starling/spine-starling/src/spine/starling/SkeletonSprite.as
+++ b/spine-starling/spine-starling/src/spine/starling/SkeletonSprite.as
@@ -54,14 +54,14 @@ import flash.geom.Rectangle;
 public class SkeletonSprite extends DisplayObject {
 	static private var _tempPoint:Point = new Point();
 	static private var _tempMatrix:Matrix = new Matrix();
-	static private var _tempVertices:Vector.<Number> = new Vector.<Number>(8);	
+	static private var _tempVertices:Vector.<Number> = new Vector.<Number>(8);
 	static internal var blendModes:Vector.<String> = new <String>[
 		BlendMode.NORMAL, BlendMode.ADD, BlendMode.MULTIPLY, BlendMode.SCREEN];
 
-	private var _skeleton:Skeleton;		
-	public var batchable:Boolean = true;	
+	private var _skeleton:Skeleton;
+	public var batchable:Boolean = true;
 	private var _smoothing:String = "bilinear";
-	
+
 	public function SkeletonSprite (skeletonData:SkeletonData) {
 		Bone.yDown = true;
 		_skeleton = new Skeleton(skeletonData);
@@ -69,7 +69,7 @@ public class SkeletonSprite extends DisplayObject {
 	}
 
 	override public function render (painter:Painter) : void {
-		alpha *= this.alpha * skeleton.a;		
+		alpha *= this.alpha * skeleton.a;
 		var originalBlendMode:String = painter.state.blendMode;
 		var r:Number = skeleton.r * 255;
 		var g:Number = skeleton.g * 255;
@@ -81,12 +81,12 @@ public class SkeletonSprite extends DisplayObject {
 		var ii:int, iii:int;
 		var rgb:uint, a:Number;
 		var mesh:SkeletonMesh;
-		var verticesLength:int, verticesCount:int, indicesLength:int;		
+		var verticesLength:int, verticesCount:int, indicesLength:int;
 		var indexData:IndexData, indices:Vector.<uint>, vertexData:VertexData;
-		var uvs: Vector.<Number>;	
-		
+		var uvs: Vector.<Number>;
+
 		for (var i:int = 0, n:int = drawOrder.length; i < n; ++i) {
-			var slot:Slot = drawOrder[i];			
+			var slot:Slot = drawOrder[i];
 			if (slot.attachment is RegionAttachment) {
 				var region:RegionAttachment = slot.attachment as RegionAttachment;
 				region.computeWorldVertices(x, y, slot.bone, worldVertices);
@@ -106,41 +106,41 @@ public class SkeletonSprite extends DisplayObject {
 						image.setTexCoords(j, p.x, p.y);
 					}
 				}
-				
+
 				image.setVertexPosition(0, worldVertices[2], worldVertices[3]);
 				image.setVertexColor(0, rgb);
 				image.setVertexAlpha(0, a);
-				
+
 				image.setVertexPosition(1, worldVertices[4], worldVertices[5]);
 				image.setVertexColor(1, rgb);
 				image.setVertexAlpha(1, a);
-				
+
 				image.setVertexPosition(2, worldVertices[0], worldVertices[1]);
 				image.setVertexColor(2, rgb);
 				image.setVertexAlpha(2, a);
-				
+
 				image.setVertexPosition(3, worldVertices[6], worldVertices[7]);
 				image.setVertexColor(3, rgb);
 				image.setVertexAlpha(3, a);
-				
-				image.setRequiresRedraw();				
+
+				image.setRequiresRedraw();
 				painter.state.blendMode = blendModes[slot.data.blendMode.ordinal];
-				// FIXME set smoothing/filter			
-				painter.batchMesh(image);				
+				// FIXME set smoothing/filter
+				painter.batchMesh(image);
 			} else if (slot.attachment is MeshAttachment) {
 				var meshAttachment:MeshAttachment = MeshAttachment(slot.attachment);
-				verticesLength  = meshAttachment.worldVerticesLength;
-				verticesCount = verticesLength >> 1;				
+				verticesLength = meshAttachment.worldVerticesLength;
+				verticesCount = verticesLength >> 1;
 				if (worldVertices.length < verticesLength) worldVertices.length = verticesLength;
 				meshAttachment.computeWorldVertices(slot, worldVertices);
 				mesh = meshAttachment.rendererObject as SkeletonMesh;
 				if (mesh == null) {
-					if (meshAttachment.rendererObject is Image) 
+					if (meshAttachment.rendererObject is Image)
 						meshAttachment.rendererObject = mesh = new SkeletonMesh(Image(meshAttachment.rendererObject).texture);
-					if (meshAttachment.rendererObject is AtlasRegion)				
+					if (meshAttachment.rendererObject is AtlasRegion)
 						meshAttachment.rendererObject = mesh = new SkeletonMesh(Image(AtlasRegion(meshAttachment.rendererObject).rendererObject).texture);
 				}
-								
+
 				if (mesh.numIndices != meshAttachment.triangles.length) {
 					indexData = mesh.getIndexData();
 					indices = meshAttachment.triangles;
@@ -151,24 +151,24 @@ public class SkeletonSprite extends DisplayObject {
 					indexData.numIndices = indicesLength;
 					indexData.trim();
 				}
-				
+
 				// FIXME pre-multiplied alpha?
 				a = slot.a * meshAttachment.a;
 				rgb = Color.rgb(
 					r * slot.r * meshAttachment.r,
 					g * slot.g * meshAttachment.g,
-					b * slot.b * meshAttachment.b);	
-					
+					b * slot.b * meshAttachment.b);
+
 				vertexData = mesh.getVertexData();
 				uvs = meshAttachment.uvs;
 				vertexData.colorize("color", rgb, a);
 				for (ii = 0, iii = 0; ii < verticesCount; ii++, iii+=2) {
 					mesh.setVertexPosition(ii, worldVertices[iii], worldVertices[iii+1]);
-					mesh.setTexCoords(ii, uvs[iii], uvs[iii+1]);			
+					mesh.setTexCoords(ii, uvs[iii], uvs[iii+1]);
 				}
 				vertexData.numVertices = verticesCount;
 				// FIXME set smoothing/filter
-				painter.batchMesh(mesh);																		
+				painter.batchMesh(mesh);
 			}
 		}
 		painter.state.blendMode = originalBlendMode;
@@ -196,7 +196,7 @@ public class SkeletonSprite extends DisplayObject {
 				var mesh:MeshAttachment = MeshAttachment(attachment);
 				verticesLength = mesh.worldVerticesLength;
 				if (worldVertices.length < verticesLength) worldVertices.length = verticesLength;
-				mesh.computeWorldVertices(slot, worldVertices);			
+				mesh.computeWorldVertices(slot, worldVertices);
 			} else
 				continue;
 			for (var ii:int = 0; ii < verticesLength; ii += 2) {
@@ -240,7 +240,7 @@ public class SkeletonSprite extends DisplayObject {
 		}
 		return resultRect;
 	}
-	
+
 	public function get skeleton () : Skeleton {
 		return _skeleton;
 	}
@@ -250,7 +250,7 @@ public class SkeletonSprite extends DisplayObject {
 	}
 
 	public function set smoothing (smoothing:String) : void {
-		_smoothing = smoothing;		
+		_smoothing = smoothing;
 	}
 }
 
diff --git a/spine-starling/spine-starling/src/spine/starling/StarlingAtlasAttachmentLoader.as b/spine-starling/spine-starling/src/spine/starling/StarlingAtlasAttachmentLoader.as
index e26fcb589..6a17c375c 100644
--- a/spine-starling/spine-starling/src/spine/starling/StarlingAtlasAttachmentLoader.as
+++ b/spine-starling/spine-starling/src/spine/starling/StarlingAtlasAttachmentLoader.as
@@ -99,7 +99,7 @@ public class StarlingAtlasAttachmentLoader implements AttachmentLoader {
 			attachment.regionV = rectRegion.y / root.height;
 			attachment.regionU2 = (rectRegion.x + subTexture.width) / root.width;
 			attachment.regionV2 = (rectRegion.y + subTexture.height) / root.height;
-			attachment.rendererObject = new Image(root);			
+			attachment.rendererObject = new Image(root);
 		} else {
 			attachment.regionU = 0;
 			attachment.regionV = 1;
@@ -119,7 +119,7 @@ public class StarlingAtlasAttachmentLoader implements AttachmentLoader {
 	public function newBoundingBoxAttachment (skin:Skin, name:String) : BoundingBoxAttachment {
 		return new BoundingBoxAttachment(name);
 	}
-	
+
 	public function newPathAttachment (skin:Skin, name:String) : PathAttachment {
 		return new PathAttachment(name);
 	}
diff --git a/spine-starling/spine-starling/src/spine/starling/StarlingTextureLoader.as b/spine-starling/spine-starling/src/spine/starling/StarlingTextureLoader.as
index df2c8c8b3..92b528d2e 100644
--- a/spine-starling/spine-starling/src/spine/starling/StarlingTextureLoader.as
+++ b/spine-starling/spine-starling/src/spine/starling/StarlingTextureLoader.as
@@ -43,7 +43,7 @@ public class StarlingTextureLoader implements TextureLoader {
 	public var bitmapDatas:Object = {};
 	public var singleBitmapData:BitmapData;
 
-	/** @param bitmaps A Bitmap or BitmapData for an atlas that has only one page, or for a multi page atlas an object where the 
+	/** @param bitmaps A Bitmap or BitmapData for an atlas that has only one page, or for a multi page atlas an object where the
 	 * key is the image path and the value is the Bitmap or BitmapData. */
 	public function StarlingTextureLoader (bitmaps:Object) {
 		if (bitmaps is BitmapData) {
@@ -54,7 +54,7 @@ public class StarlingTextureLoader implements TextureLoader {
 			singleBitmapData = Bitmap(bitmaps).bitmapData;
 			return;
 		}
-		
+
 		for (var path:* in bitmaps) {
 			var object:* = bitmaps[path];
 			var bitmapData:BitmapData;
@@ -79,7 +79,7 @@ public class StarlingTextureLoader implements TextureLoader {
 
 	public function loadRegion (region:AtlasRegion) : void {
 		var image:Image = new Image(Texture(region.page.rendererObject));
-		if (region.rotate) {			
+		if (region.rotate) {
 			image.setTexCoords(0, region.u, region.v2);
 			image.setTexCoords(1, region.u, region.v);
 			image.setTexCoords(2, region.u2, region.v2);
diff --git a/spine-ts/canvas/src/CanvasTexture.ts b/spine-ts/canvas/src/CanvasTexture.ts
index a3a784ed3..0691be06d 100644
--- a/spine-ts/canvas/src/CanvasTexture.ts
+++ b/spine-ts/canvas/src/CanvasTexture.ts
@@ -30,7 +30,7 @@
 
 /// <reference path="../../core/src/Texture.ts"/>
 
-module spine.canvas {	
+module spine.canvas {
 	export class CanvasTexture extends Texture {
 		constructor (image: HTMLImageElement) {
 			super(image);
diff --git a/spine-ts/canvas/src/SkeletonRenderer.ts b/spine-ts/canvas/src/SkeletonRenderer.ts
index eab037f79..14863f1cc 100644
--- a/spine-ts/canvas/src/SkeletonRenderer.ts
+++ b/spine-ts/canvas/src/SkeletonRenderer.ts
@@ -31,12 +31,12 @@
 module spine.canvas {
 	export class SkeletonRenderer {
 		static QUAD_TRIANGLES = [0, 1, 2, 2, 3, 0];
-		
+
 		private ctx: CanvasRenderingContext2D;
 
 		public triangleRendering = false;
 		public debugRendering = false;
-		
+
 		constructor (context: CanvasRenderingContext2D) {
 			this.ctx = context;
 		}
@@ -50,21 +50,21 @@ module spine.canvas {
 			let ctx = this.ctx;
 			let drawOrder = skeleton.drawOrder;
 
-			if (this.debugRendering) ctx.strokeStyle = "green";			
+			if (this.debugRendering) ctx.strokeStyle = "green";
 
-			for (let i = 0, n = drawOrder.length; i < n; i++) {				
+			for (let i = 0, n = drawOrder.length; i < n; i++) {
 				let slot = drawOrder[i];
 				let attachment = slot.getAttachment();
 				let region: TextureAtlasRegion = null;
 				let image: HTMLImageElement = null;
-				let vertices: ArrayLike<number> = null;	
+				let vertices: ArrayLike<number> = null;
 				if (attachment instanceof RegionAttachment) {
 					let regionAttachment = <RegionAttachment>attachment;
 					vertices = regionAttachment.updateWorldVertices(slot, false);
-					region = <TextureAtlasRegion>regionAttachment.region;										
+					region = <TextureAtlasRegion>regionAttachment.region;
 					image = (<CanvasTexture>(region).texture).getImage();
 
-				} else continue;							
+				} else continue;
 
 				let att = <RegionAttachment>attachment;
 				let bone = slot.bone;
@@ -75,28 +75,28 @@ module spine.canvas {
 				let xy = vertices[25] - vertices[1];
 				let yx = vertices[8] - vertices[0];
 				let yy = vertices[9] - vertices[1];
-				let w = Math.sqrt(xx * xx + xy * xy), h = -Math.sqrt(yx * yx + yy * yy);				
+				let w = Math.sqrt(xx * xx + xy * xy), h = -Math.sqrt(yx * yx + yy * yy);
 				ctx.translate(x, y);
-				ctx.rotate(rotation);				
+				ctx.rotate(rotation);
 				if (region.rotate) {
 					ctx.rotate(Math.PI / 2);
 					ctx.drawImage(image, region.x, region.y, region.height, region.width, 0, 0, h, -w);
-					ctx.rotate(-Math.PI / 2);					
+					ctx.rotate(-Math.PI / 2);
 				} else {
 					ctx.drawImage(image, region.x, region.y, region.width, region.height, 0, 0, w, h);
 				}
 				if (this.debugRendering) ctx.strokeRect(0, 0, w, h);
 				ctx.rotate(-rotation);
-				ctx.translate(-x, -y);				
-			}			
+				ctx.translate(-x, -y);
+			}
 		}
 
-		private drawTriangles (skeleton: Skeleton) {			
-			let blendMode: BlendMode = null;			
+		private drawTriangles (skeleton: Skeleton) {
+			let blendMode: BlendMode = null;
 
 			let vertices: ArrayLike<number> = null;
-			let triangles: Array<number>  = null;
-			let drawOrder = skeleton.drawOrder;			
+			let triangles: Array<number> = null;
+			let drawOrder = skeleton.drawOrder;
 
 			for (let i = 0, n = drawOrder.length; i < n; i++) {
 				let slot = drawOrder[i];
@@ -115,22 +115,22 @@ module spine.canvas {
 					vertices = mesh.updateWorldVertices(slot, false);
 					triangles = mesh.triangles;
 					texture = (<TextureAtlasRegion>mesh.region.renderObject).texture.getImage();
-				} else continue;				
+				} else continue;
 
 				if (texture != null) {
 					let slotBlendMode = slot.data.blendMode;
 					if (slotBlendMode != blendMode) {
-						blendMode = slotBlendMode;						
+						blendMode = slotBlendMode;
 					}
 
-					let ctx = this.ctx;		
+					let ctx = this.ctx;
 
 					for (var j = 0; j < triangles.length; j+=3) {
 						let t1 = triangles[j] * 8, t2 = triangles[j+1] * 8, t3 = triangles[j+2] * 8;
 
 						let x0 = vertices[t1], y0 = vertices[t1 + 1], u0 = vertices[t1 + 6], v0 = vertices[t1 + 7];
 						let x1 = vertices[t2], y1 = vertices[t2 + 1], u1 = vertices[t2 + 6], v1 = vertices[t2 + 7];
-						let x2 = vertices[t3], y2 = vertices[t3 + 1], u2 = vertices[t3 + 6], v2 = vertices[t3 + 7];				
+						let x2 = vertices[t3], y2 = vertices[t3 + 1], u2 = vertices[t3 + 6], v2 = vertices[t3 + 7];
 
 						this.drawTriangle(texture, x0, y0, u0, v0, x1, y1, u1, v1, x2, y2, u2, v2);
 
@@ -140,13 +140,13 @@ module spine.canvas {
 							ctx.moveTo(x0, y0);
 							ctx.lineTo(x1, y1);
 							ctx.lineTo(x2, y2);
-							ctx.lineTo(x0, y0);				
+							ctx.lineTo(x0, y0);
 							ctx.stroke();
 						}
-					}												
-				}				
-			}			
-		}		
+					}
+				}
+			}
+		}
 
 		// Adapted from http://extremelysatisfactorytotalitarianism.com/blog/?p=2120
 		// Apache 2 licensed
@@ -194,7 +194,7 @@ module spine.canvas {
 			ctx.transform(a, b, c, d, e, f);
 			ctx.clip();
 			ctx.drawImage(img, 0, 0);
-			ctx.restore();			
+			ctx.restore();
 		}
 	}
 }
diff --git a/spine-ts/core/src/Animation.ts b/spine-ts/core/src/Animation.ts
index c317c5569..7ed2749b8 100644
--- a/spine-ts/core/src/Animation.ts
+++ b/spine-ts/core/src/Animation.ts
@@ -102,7 +102,7 @@ module spine {
 
 		constructor (frameCount: number) {
 			if (frameCount <= 0) throw new Error("frameCount must be > 0: " + frameCount);
-			this.curves = Utils.newFloatArray((frameCount - 1) * CurveTimeline.BEZIER_SIZE);			
+			this.curves = Utils.newFloatArray((frameCount - 1) * CurveTimeline.BEZIER_SIZE);
 		}
 
 		getFrameCount () {
diff --git a/spine-ts/core/src/AnimationState.ts b/spine-ts/core/src/AnimationState.ts
index db50d4404..9b83c6d67 100644
--- a/spine-ts/core/src/AnimationState.ts
+++ b/spine-ts/core/src/AnimationState.ts
@@ -136,7 +136,7 @@ module spine {
 			if (current == null) return;
 
 			if (current.listener != null && current.listener.end != null) current.listener.end(trackIndex);
-			for (let i = 0, n = this.listeners.length; i < n; i++)			
+			for (let i = 0, n = this.listeners.length; i < n; i++)
 				if (this.listeners[i].end) this.listeners[i].end(trackIndex);
 
 			this.tracks[trackIndex] = null;
diff --git a/spine-ts/core/src/AssetManager.ts b/spine-ts/core/src/AssetManager.ts
index 430562aee..5a97f71a2 100644
--- a/spine-ts/core/src/AssetManager.ts
+++ b/spine-ts/core/src/AssetManager.ts
@@ -84,7 +84,7 @@ module spine {
 			}
 			img.onerror = (ev) => {
 				if (error) error(path, `Couldn't load image ${path}`);
-				this.errors[path] =  `Couldn't load image ${path}`;
+				this.errors[path] = `Couldn't load image ${path}`;
 				this.toLoad--;
 				this.loaded++;
 			}
@@ -98,7 +98,7 @@ module spine {
 		remove (path: string) {
 			path = this.pathPrefix + path;
 			let asset = this.assets[path];
-			if ((<any>asset).dispose) (<any>asset).dispose();			
+			if ((<any>asset).dispose) (<any>asset).dispose();
 			this.assets[path] = null;
 		}
 
diff --git a/spine-ts/core/src/AtlasAttachmentLoader.ts b/spine-ts/core/src/AtlasAttachmentLoader.ts
index c75a3ca4c..33d43dc9b 100644
--- a/spine-ts/core/src/AtlasAttachmentLoader.ts
+++ b/spine-ts/core/src/AtlasAttachmentLoader.ts
@@ -42,7 +42,7 @@ module spine {
 			if (region == null) throw new Error("Region not found in atlas: " + path + " (region attachment: " + name + ")");
 			region.renderObject = region;
 			let attachment = new RegionAttachment(name);
-			attachment.setRegion(region);			
+			attachment.setRegion(region);
 			return attachment;
 		}
 
diff --git a/spine-ts/core/src/SharedAssetManager.ts b/spine-ts/core/src/SharedAssetManager.ts
index 08c265725..f3ed7cea3 100644
--- a/spine-ts/core/src/SharedAssetManager.ts
+++ b/spine-ts/core/src/SharedAssetManager.ts
@@ -33,7 +33,7 @@ module spine {
 		clientId: string;
 		toLoad = new Array<string>();
 		assets: Map<any> = {};
-		textureLoader: (image: HTMLImageElement) => any;	
+		textureLoader: (image: HTMLImageElement) => any;
 
 		constructor(clientId: string) {
 			this.clientId = clientId;
@@ -47,13 +47,13 @@ module spine {
 	}
 
 	export class SharedAssetManager implements Disposable {
-		private pathPrefix: string;		
+		private pathPrefix: string;
 		private clientAssets: Map<Assets> = {};
 		private queuedAssets: Map<string> = {};
-		private rawAssets: Map<any> = {}		
+		private rawAssets: Map<any> = {}
 		private errors: Map<string> = {};
 
-		constructor (pathPrefix: string = "") {			
+		constructor (pathPrefix: string = "") {
 			this.pathPrefix = pathPrefix;
 		}
 
@@ -78,13 +78,13 @@ module spine {
 
 		loadText(clientId: string, path: string) {
 			path = this.pathPrefix + path;
-			if (!this.queueAsset(clientId, null, path)) return;			
+			if (!this.queueAsset(clientId, null, path)) return;
 			let request = new XMLHttpRequest();
 			request.onreadystatechange = () => {
 				if (request.readyState == XMLHttpRequest.DONE) {
-					if (request.status >= 200 && request.status < 300) {						
+					if (request.status >= 200 && request.status < 300) {
 						this.rawAssets[path] = request.responseText;
-					} else {						
+					} else {
 						this.errors[path] = `Couldn't load text ${path}: status ${request.status}, ${request.responseText}`;
 					}
 				}
@@ -95,13 +95,13 @@ module spine {
 
 		loadJson(clientId: string, path: string) {
 			path = this.pathPrefix + path;
-			if (!this.queueAsset(clientId, null, path)) return;			
+			if (!this.queueAsset(clientId, null, path)) return;
 			let request = new XMLHttpRequest();
 			request.onreadystatechange = () => {
 				if (request.readyState == XMLHttpRequest.DONE) {
-					if (request.status >= 200 && request.status < 300) {						
+					if (request.status >= 200 && request.status < 300) {
 						this.rawAssets[path] = JSON.parse(request.responseText);
-					} else {						
+					} else {
 						this.errors[path] = `Couldn't load text ${path}: status ${request.status}, ${request.responseText}`;
 					}
 				}
@@ -113,15 +113,15 @@ module spine {
 		loadTexture (clientId: string, textureLoader: (image: HTMLImageElement) => any, path: string) {
 			path = this.pathPrefix + path;
 			if (!this.queueAsset(clientId, textureLoader, path)) return;
-						
+
 			let img = new Image();			 
-			img.src = path;			
+			img.src = path;
 			img.crossOrigin = "anonymous";
-			img.onload = (ev) => {								
-				this.rawAssets[path] = img;				
+			img.onload = (ev) => {
+				this.rawAssets[path] = img;
 			}
-			img.onerror = (ev) => {				
-				this.errors[path] =  `Couldn't load image ${path}`;				
+			img.onerror = (ev) => {
+				this.errors[path] = `Couldn't load image ${path}`;
 			}
 		}
 
@@ -129,7 +129,7 @@ module spine {
 			path = this.pathPrefix + path;
 			var clientAssets = this.clientAssets[clientId];
 			if (clientAssets === null || clientAssets === undefined) return true;
-			return clientAssets.assets[path];			
+			return clientAssets.assets[path];
 		}
 
 		private updateClientAssets(clientAssets: Assets): void {
@@ -151,7 +151,7 @@ module spine {
 		isLoadingComplete (clientId: string): boolean {
 			var clientAssets = this.clientAssets[clientId];
 			if (clientAssets === null || clientAssets === undefined) return true;
-			this.updateClientAssets(clientAssets);			
+			this.updateClientAssets(clientAssets);
 			return clientAssets.toLoad.length == clientAssets.loaded();
 
 		}
@@ -159,7 +159,7 @@ module spine {
 		/*remove (clientId: string, path: string) {
 			path = this.pathPrefix + path;
 			let asset = this.assets[path];
-			if ((<any>asset).dispose) (<any>asset).dispose();			
+			if ((<any>asset).dispose) (<any>asset).dispose();
 			this.assets[path] = null;
 		}
 
@@ -170,7 +170,7 @@ module spine {
 			}
 			this.assets = {};
 		}*/
-		
+
 		dispose () {
 			// this.removeAll();
 		}
diff --git a/spine-ts/core/src/SkeletonBounds.ts b/spine-ts/core/src/SkeletonBounds.ts
index 69c5d267b..233b03bfb 100644
--- a/spine-ts/core/src/SkeletonBounds.ts
+++ b/spine-ts/core/src/SkeletonBounds.ts
@@ -183,7 +183,7 @@ module spine {
 
 		/** Returns the polygon for the specified bounding box, or null. */
 		getPolygon (boundingBox: BoundingBoxAttachment) {
-			if (boundingBox == null) throw new Error("boundingBox cannot be null.");			
+			if (boundingBox == null) throw new Error("boundingBox cannot be null.");
 			let index = this.boundingBoxes.indexOf(boundingBox);
 			return index == -1 ? null : this.polygons[index];
 		}
diff --git a/spine-ts/core/src/SkeletonJson.ts b/spine-ts/core/src/SkeletonJson.ts
index c9fa98c46..1c21f7642 100644
--- a/spine-ts/core/src/SkeletonJson.ts
+++ b/spine-ts/core/src/SkeletonJson.ts
@@ -40,7 +40,7 @@ module spine {
 
 		readSkeletonData (json: string | any ): SkeletonData {
 			let scale = this.scale;
-			let skeletonData = new SkeletonData();			
+			let skeletonData = new SkeletonData();
 			let root = typeof(json) === "string" ? JSON.parse(json) : json;
 
 			// Skeleton
diff --git a/spine-ts/core/src/Skin.ts b/spine-ts/core/src/Skin.ts
index cbc14168f..c4313e7b6 100644
--- a/spine-ts/core/src/Skin.ts
+++ b/spine-ts/core/src/Skin.ts
@@ -47,7 +47,7 @@ module spine {
 		}
 
 		/** @return May be null. */
-		getAttachment (slotIndex: number, name: string): Attachment {			
+		getAttachment (slotIndex: number, name: string): Attachment {
 			let dictionary = this.attachments[slotIndex];
 			return dictionary ? dictionary[name] : null;
 		}
diff --git a/spine-ts/core/src/Texture.ts b/spine-ts/core/src/Texture.ts
index c21f795c2..d5682f454 100644
--- a/spine-ts/core/src/Texture.ts
+++ b/spine-ts/core/src/Texture.ts
@@ -41,9 +41,8 @@ module spine {
 		}
 
 		abstract setFilters (minFilter: TextureFilter, magFilter: TextureFilter): void;
-		abstract setWraps (uWrap: TextureWrap, vWrap: TextureWrap): void;		
+		abstract setWraps (uWrap: TextureWrap, vWrap: TextureWrap): void;
 		abstract dispose (): void;
-		
 
 		public static filterFromString (text: string): TextureFilter {
 			switch (text.toLowerCase()) {
diff --git a/spine-ts/core/src/TextureAtlas.ts b/spine-ts/core/src/TextureAtlas.ts
index 3d64dced6..047c431fd 100644
--- a/spine-ts/core/src/TextureAtlas.ts
+++ b/spine-ts/core/src/TextureAtlas.ts
@@ -78,7 +78,7 @@ module spine {
 
 					page.texture = textureLoader(line);
 					page.texture.setFilters(page.minFilter, page.magFilter);
-					page.texture.setWraps(page.uWrap, page.vWrap);					
+					page.texture.setWraps(page.uWrap, page.vWrap);
 					page.width = page.texture.getImage().width;
 					page.height = page.texture.getImage().height;
 					this.pages.push(page);
diff --git a/spine-ts/core/src/Utils.ts b/spine-ts/core/src/Utils.ts
index 63aa5b862..9068f8043 100644
--- a/spine-ts/core/src/Utils.ts
+++ b/spine-ts/core/src/Utils.ts
@@ -130,7 +130,7 @@ module spine {
 
 		static cbrt (x: number) {
 			var y = Math.pow(Math.abs(x), 1/3);
-  			return x < 0 ? -y : y;
+			return x < 0 ? -y : y;
 		}
 	}
 
@@ -235,7 +235,7 @@ module spine {
 	}
 
 	export class TimeKeeper {
-		maxDelta = 0.064;		
+		maxDelta = 0.064;
 		framesPerSecond = 0;
 		delta = 0;
 		totalTime = 0;
@@ -251,7 +251,7 @@ module spine {
 			this.totalTime += this.delta;
 			if (this.delta > this.maxDelta) this.delta = this.maxDelta;
 			this.lastTime = now;
-			
+
 			this.frameCount++;
 			if (this.frameTime > 1) {
 				this.framesPerSecond = this.frameCount / this.frameTime;
diff --git a/spine-ts/threejs/src/MeshBatcher.ts b/spine-ts/threejs/src/MeshBatcher.ts
index 11e70f4ff..7b6427d45 100644
--- a/spine-ts/threejs/src/MeshBatcher.ts
+++ b/spine-ts/threejs/src/MeshBatcher.ts
@@ -35,7 +35,7 @@ module spine.threejs {
 		private static VERTEX_SIZE = 9;
 		private vertexBuffer: THREE.InterleavedBuffer;
 		private vertices: Float32Array;
-		private verticesLength = 0;		
+		private verticesLength = 0;
 		private indices: Uint16Array;
 		private indicesLength = 0;
 
@@ -44,7 +44,7 @@ module spine.threejs {
 
 			let vertices = this.vertices = new Float32Array(maxVertices * MeshBatcher.VERTEX_SIZE);
 			let indices = this.indices = new Uint16Array(maxVertices * 3);
-			this.mesh = mesh;			
+			this.mesh = mesh;
 			let geo = new THREE.BufferGeometry();
 			let vertexBuffer = this.vertexBuffer = new THREE.InterleavedBuffer(vertices, MeshBatcher.VERTEX_SIZE);
 			vertexBuffer.dynamic = true;
@@ -78,13 +78,13 @@ module spine.threejs {
 				vertexBuffer[i++] = vertices[j++];
 				vertexBuffer[i++] = vertices[j++];
 				vertexBuffer[i++] = vertices[j++];
-			}			
-			this.verticesLength = i;			
+			}
+			this.verticesLength = i;
 
 			let indicesArray = this.indices;
 			for (i = this.indicesLength, j = 0; j < indices.length; i++, j++)
 				indicesArray[i] = indices[j] + indexStart;
-			this.indicesLength += indices.length;			
+			this.indicesLength += indices.length;
 		}
 
 		end () {
@@ -96,7 +96,7 @@ module spine.threejs {
 			geo.getIndex().updateRange.offset = 0;
 			geo.getIndex().updateRange.count = this.indicesLength;
 			geo.drawRange.start = 0;
-			geo.drawRange.count = this.indicesLength;				
+			geo.drawRange.count = this.indicesLength;
 		}
 	}
 }
diff --git a/spine-ts/threejs/src/SkeletonMesh.ts b/spine-ts/threejs/src/SkeletonMesh.ts
index bd5488cba..bc650c155 100644
--- a/spine-ts/threejs/src/SkeletonMesh.ts
+++ b/spine-ts/threejs/src/SkeletonMesh.ts
@@ -49,8 +49,8 @@ module spine.threejs {
 			let material = this.material = new THREE.MeshBasicMaterial();
 			material.side = THREE.DoubleSide;
 			material.transparent = true;
-			material.alphaTest = 0.5;									
-			this.batcher = new MeshBatcher(this);			
+			material.alphaTest = 0.5;
+			this.batcher = new MeshBatcher(this);
 		}
 
 		update(deltaTime: number) {
@@ -69,11 +69,11 @@ module spine.threejs {
 			var numVertices = 0;
 			var verticesLength = 0;
 			var indicesLength = 0;
-			
+
 			let blendMode: BlendMode = null;
 
 			let vertices: ArrayLike<number> = null;
-			let triangles: Array<number>  = null;
+			let triangles: Array<number> = null;
 			let drawOrder = this.skeleton.drawOrder;
 			let batcher = this.batcher;
 			batcher.begin();
@@ -98,19 +98,19 @@ module spine.threejs {
 
 				if (texture != null) {
 					if (!(<THREE.MeshBasicMaterial>this.material).map) {
-						let mat = <THREE.MeshBasicMaterial>this.material;						
+						let mat = <THREE.MeshBasicMaterial>this.material;
 						mat.map = texture.texture;
-						mat.needsUpdate = true;						
+						mat.needsUpdate = true;
 					}
 					// FIXME per slot blending would require multiple material support
-					//let slotBlendMode = slot.data.blendMode;					
+					//let slotBlendMode = slot.data.blendMode;
 					//if (slotBlendMode != blendMode) {
 					//	blendMode = slotBlendMode;
 					//	batcher.setBlendMode(getSourceGLBlendMode(this._gl, blendMode, premultipliedAlpha), getDestGLBlendMode(this._gl, blendMode));
 					//}
-					
+
 					this.batcher.batch(vertices, triangles, z);
-					z += zOffset;				
+					z += zOffset;
 				}
 			}
 
@@ -143,7 +143,7 @@ module spine.threejs {
 			let mat = new THREE.MeshBasicMaterial();
 			mat.vertexColors = THREE.VertexColors;
 			mat.transparent = true;
-			mat.map = map;		
+			mat.map = map;
 			let mesh = new THREE.Mesh(geo, mat);
 			return mesh; 
 		}
diff --git a/spine-ts/threejs/src/ThreeJsTexture.ts b/spine-ts/threejs/src/ThreeJsTexture.ts
index 966a62dda..219ffcc28 100644
--- a/spine-ts/threejs/src/ThreeJsTexture.ts
+++ b/spine-ts/threejs/src/ThreeJsTexture.ts
@@ -55,7 +55,7 @@ module spine.threejs {
 
 		static toThreeJsTextureFilter(filter: TextureFilter) {
 			if (filter === TextureFilter.Linear) return THREE.LinearFilter;
-			else if (filter === TextureFilter.MipMap) return THREE.LinearMipMapLinearFilter; // also includes TextureFilter.MipMapLinearLinear			
+			else if (filter === TextureFilter.MipMap) return THREE.LinearMipMapLinearFilter; // also includes TextureFilter.MipMapLinearLinear
 			else if (filter === TextureFilter.MipMapLinearNearest) return THREE.LinearMipMapNearestFilter;
 			else if (filter === TextureFilter.MipMapNearestLinear) return THREE.NearestMipMapLinearFilter;
 			else if (filter === TextureFilter.MipMapNearestNearest) return THREE.NearestMipMapNearestFilter;
diff --git a/spine-ts/webgl/src/Camera.ts b/spine-ts/webgl/src/Camera.ts
index 22ba83353..776dc6c43 100644
--- a/spine-ts/webgl/src/Camera.ts
+++ b/spine-ts/webgl/src/Camera.ts
@@ -37,11 +37,11 @@ module spine.webgl {
 		far = 100;
 		zoom = 1;
 		viewportWidth = 0;
-		viewportHeight = 0;		
+		viewportHeight = 0;
 		projectionView = new Matrix4();
 		inverseProjectionView = new Matrix4();
 		projection = new Matrix4();
-		view = new Matrix4();		
+		view = new Matrix4();
 
 		private tmp = new Vector3();
 
@@ -56,22 +56,22 @@ module spine.webgl {
 			let view = this.view;
 			let projectionView = this.projectionView;
 			let inverseProjectionView = this.inverseProjectionView;
-			let zoom = this.zoom, viewportWidth = this.viewportWidth, viewportHeight = this.viewportHeight;			
+			let zoom = this.zoom, viewportWidth = this.viewportWidth, viewportHeight = this.viewportHeight;
 			projection.ortho(zoom * (-viewportWidth / 2), zoom * (viewportWidth / 2),
 							 zoom * (-viewportHeight / 2), zoom * (viewportHeight / 2),
-							 this.near, this.far);						
+							 this.near, this.far);
 			view.lookAt(this.position, this.direction, this.up);
 			projectionView.set(projection.values);
 			projectionView.multiply(view);
-			inverseProjectionView.set(projectionView.values).invert();			
+			inverseProjectionView.set(projectionView.values).invert();
 		}
 
 		screenToWorld (screenCoords: Vector3, screenWidth: number, screenHeight: number) {
-			let x = screenCoords.x, y = screenHeight - screenCoords.y - 1;			
-			let tmp = this.tmp;			
+			let x = screenCoords.x, y = screenHeight - screenCoords.y - 1;
+			let tmp = this.tmp;
 			tmp.x = (2 * x) / screenWidth - 1;
 			tmp.y = (2 * y) / screenHeight - 1;
-			tmp.z = (2 * screenCoords.z) - 1;			
+			tmp.z = (2 * screenCoords.z) - 1;
 			tmp.project(this.inverseProjectionView);
 			screenCoords.set(tmp.x, tmp.y, tmp.z);
 			return screenCoords;
diff --git a/spine-ts/webgl/src/GLTexture.ts b/spine-ts/webgl/src/GLTexture.ts
index 35e42747a..914419ab9 100644
--- a/spine-ts/webgl/src/GLTexture.ts
+++ b/spine-ts/webgl/src/GLTexture.ts
@@ -31,13 +31,13 @@
 module spine.webgl {
 	export class GLTexture extends Texture implements Disposable {
 		private gl: WebGLRenderingContext;
-		private texture: WebGLTexture;		
+		private texture: WebGLTexture;
 		private boundUnit = 0;
 
 		constructor (gl: WebGLRenderingContext, image: HTMLImageElement, useMipMaps: boolean = false) {
 			super(image);
-			this.gl = gl;			
-			this.texture = gl.createTexture();			
+			this.gl = gl;
+			this.texture = gl.createTexture();
 			this.update(useMipMaps);
 		}
 
diff --git a/spine-ts/webgl/src/Input.ts b/spine-ts/webgl/src/Input.ts
index adc3286bf..b91f56371 100644
--- a/spine-ts/webgl/src/Input.ts
+++ b/spine-ts/webgl/src/Input.ts
@@ -50,7 +50,7 @@ module spine.webgl {
 				if (ev instanceof MouseEvent) {
 					let rect = element.getBoundingClientRect();
 					let x = ev.clientX - rect.left;
-					let y = ev.clientY - rect.top;					
+					let y = ev.clientY - rect.top;
 
 					let listeners = this.listeners;
 					for (let i = 0; i < listeners.length; i++) {
@@ -66,7 +66,7 @@ module spine.webgl {
 				if (ev instanceof MouseEvent) {
 					let rect = element.getBoundingClientRect();
 					let x = ev.clientX - rect.left;
-					let y = ev.clientY - rect.top;					
+					let y = ev.clientY - rect.top;
 
 					let listeners = this.listeners;
 					for (let i = 0; i < listeners.length; i++) {
@@ -78,14 +78,14 @@ module spine.webgl {
 					}
 
 					this.lastX = x;
-					this.lastY = y;					
+					this.lastY = y;
 				}
 			}, true);
 			element.addEventListener("mouseup", (ev: UIEvent) => {
 				if (ev instanceof MouseEvent) {
 					let rect = element.getBoundingClientRect();
 					let x = ev.clientX - rect.left;
-					let y = ev.clientY - rect.top;					
+					let y = ev.clientY - rect.top;
 
 					let listeners = this.listeners;
 					for (let i = 0; i < listeners.length; i++) {
@@ -97,12 +97,12 @@ module spine.webgl {
 					this.buttonDown = false;
 				}
 			}, true);
-			element.addEventListener("touchstart", (ev: TouchEvent) => {								
+			element.addEventListener("touchstart", (ev: TouchEvent) => {
 				if (this.currTouch != null) return;
 
-				var touches = ev.changedTouches;				
-				for (var i = 0; i < touches.length; i++) {					
-					var touch = touches[i];									
+				var touches = ev.changedTouches;
+				for (var i = 0; i < touches.length; i++) {
+					var touch = touches[i];
 					let rect = element.getBoundingClientRect();
 					let x = touch.clientX - rect.left;
 					let y = touch.clientY - rect.top;
@@ -111,7 +111,7 @@ module spine.webgl {
 					this.currTouch.x = x;
 					this.currTouch.y = y;
 					break;
-				}												
+				}
 
 				let listeners = this.listeners;
 				for (let i = 0; i < listeners.length; i++) {
@@ -130,7 +130,7 @@ module spine.webgl {
 					if (this.currTouch.identifier === touch.identifier) {
 						let rect = element.getBoundingClientRect();
 						let x = this.currTouch.x = touch.clientX - rect.left;
-						let y = this.currTouch.y = touch.clientY - rect.top;						
+						let y = this.currTouch.y = touch.clientY - rect.top;
 						this.touchesPool.free(this.currTouch);
 						let listeners = this.listeners;
 						for (let i = 0; i < listeners.length; i++) {
@@ -146,14 +146,14 @@ module spine.webgl {
 				}
 				ev.preventDefault();
 			}, false);
-			element.addEventListener("touchcancel", (ev: TouchEvent) => {				
+			element.addEventListener("touchcancel", (ev: TouchEvent) => {
 				var touches = ev.changedTouches;
 				for (var i = 0; i < touches.length; i++) {
 					var touch = touches[i];
 					if (this.currTouch.identifier === touch.identifier) {
 						let rect = element.getBoundingClientRect();
 						let x = this.currTouch.x = touch.clientX - rect.left;
-						let y = this.currTouch.y = touch.clientY - rect.top;						
+						let y = this.currTouch.y = touch.clientY - rect.top;
 						this.touchesPool.free(this.currTouch);
 						let listeners = this.listeners;
 						for (let i = 0; i < listeners.length; i++) {
@@ -169,7 +169,7 @@ module spine.webgl {
 				}
 				ev.preventDefault();
 			}, false);
-			element.addEventListener("touchmove", (ev: TouchEvent) => {				
+			element.addEventListener("touchmove", (ev: TouchEvent) => {
 				if (this.currTouch == null) return;
 
 				var touches = ev.changedTouches;
@@ -178,7 +178,7 @@ module spine.webgl {
 					if (this.currTouch.identifier === touch.identifier) {
 						let rect = element.getBoundingClientRect();
 						let x = touch.clientX - rect.left;
-						let y = touch.clientY - rect.top;						
+						let y = touch.clientY - rect.top;
 
 						let listeners = this.listeners;
 						for (let i = 0; i < listeners.length; i++) {
@@ -207,7 +207,7 @@ module spine.webgl {
 	}
 
 	export class Touch {
-		constructor(public identifier: number, public x: number, public y: number) {			
+		constructor(public identifier: number, public x: number, public y: number) {
 		}
 	}
 
diff --git a/spine-ts/webgl/src/LoadingScreen.ts b/spine-ts/webgl/src/LoadingScreen.ts
index 81e6fe5bd..872321b8f 100644
--- a/spine-ts/webgl/src/LoadingScreen.ts
+++ b/spine-ts/webgl/src/LoadingScreen.ts
@@ -59,7 +59,7 @@ module spine.webgl {
 				// thank you Apple Inc.
 				let isSafari = navigator.userAgent.indexOf("Safari") > -1;
 
-				LoadingScreen.logoImg = new Image();						
+				LoadingScreen.logoImg = new Image();
 				LoadingScreen.logoImg.src = LoadingScreen.SPINE_LOGO_DATA;
 				if (!isSafari) LoadingScreen.logoImg.crossOrigin = "anonymous";
 				LoadingScreen.logoImg.onload = (ev) => {
@@ -68,7 +68,7 @@ module spine.webgl {
 
 				LoadingScreen.spinnerImg = new Image();
 				LoadingScreen.spinnerImg.src = LoadingScreen.SPINNER_DATA;
-				if (!isSafari) LoadingScreen.spinnerImg.crossOrigin = "anonymous";	
+				if (!isSafari) LoadingScreen.spinnerImg.crossOrigin = "anonymous";
 				LoadingScreen.spinnerImg.onload = (ev) => {
 					LoadingScreen.loaded++;
 				}
@@ -115,7 +115,7 @@ module spine.webgl {
 			if (LoadingScreen.loaded != 2) return;
 			if (this.logo === null) {
 				this.logo = new GLTexture(renderer.gl, LoadingScreen.logoImg);
-				this.spinner = new GLTexture(renderer.gl, LoadingScreen.spinnerImg);				
+				this.spinner = new GLTexture(renderer.gl, LoadingScreen.spinnerImg);
 			}
 			this.logo.update(false);
 			this.spinner.update(false);
@@ -127,7 +127,7 @@ module spine.webgl {
 
 			renderer.batcher.setBlendMode(WebGLRenderingContext.SRC_ALPHA, WebGLRenderingContext.ONE_MINUS_SRC_ALPHA);
 			renderer.begin();
-			renderer.drawTexture(this.logo, (canvas.width - logoWidth) / 2, (canvas.height - logoHeight) / 2, logoWidth, logoHeight, this.tempColor);			
+			renderer.drawTexture(this.logo, (canvas.width - logoWidth) / 2, (canvas.height - logoHeight) / 2, logoWidth, logoHeight, this.tempColor);
 			renderer.drawTextureRotated(this.spinner, (canvas.width - spinnerWidth) / 2, (canvas.height - spinnerHeight) / 2, spinnerWidth, spinnerHeight, spinnerWidth / 2, spinnerHeight / 2, this.angle, this.tempColor);
 			renderer.end();
 
diff --git a/spine-ts/webgl/src/Matrix4.ts b/spine-ts/webgl/src/Matrix4.ts
index ab109df18..467e4d438 100644
--- a/spine-ts/webgl/src/Matrix4.ts
+++ b/spine-ts/webgl/src/Matrix4.ts
@@ -49,7 +49,7 @@ module spine.webgl {
 	export class Matrix4 {
 		temp: Float32Array = new Float32Array(16);
 		values: Float32Array = new Float32Array(16);
-				
+
 		private static xAxis: Vector3 = null;
 		private static yAxis: Vector3 = null;
 		private static zAxis: Vector3 = null;
diff --git a/spine-ts/webgl/src/PolygonBatcher.ts b/spine-ts/webgl/src/PolygonBatcher.ts
index 537033e75..d30a44848 100644
--- a/spine-ts/webgl/src/PolygonBatcher.ts
+++ b/spine-ts/webgl/src/PolygonBatcher.ts
@@ -34,7 +34,7 @@ module spine.webgl {
 		private drawCalls: number;
 		private isDrawing = false;
 		private mesh: Mesh;
-		private shader: Shader = null;		
+		private shader: Shader = null;
 		private lastTexture: GLTexture = null;
 		private verticesLength = 0;
 		private indicesLength = 0;
@@ -44,10 +44,10 @@ module spine.webgl {
 		constructor (gl: WebGLRenderingContext, maxVertices: number = 10920) {
 			if (maxVertices > 10920) throw new Error("Can't have more than 10920 triangles per batch: " + maxVertices);
 			this.gl = gl;
-			this.mesh = new Mesh(gl, [new Position2Attribute(), new ColorAttribute(), new TexCoordAttribute()], maxVertices, maxVertices * 3);			
+			this.mesh = new Mesh(gl, [new Position2Attribute(), new ColorAttribute(), new TexCoordAttribute()], maxVertices, maxVertices * 3);
 		}
 
-		begin (shader: Shader) {			
+		begin (shader: Shader) {
 			let gl = this.gl;
 			if (this.isDrawing) throw new Error("PolygonBatch is already drawing. Call PolygonBatch.end() before calling PolygonBatch.begin()");
 			this.drawCalls = 0;
@@ -118,7 +118,7 @@ module spine.webgl {
 		getDrawCalls () { return this.drawCalls; }
 
 		dispose () {
-			this.mesh.dispose();			
+			this.mesh.dispose();
 		}
 	}
 }
diff --git a/spine-ts/webgl/src/SceneRenderer.ts b/spine-ts/webgl/src/SceneRenderer.ts
index 3dd4f3ad2..898b10d3c 100644
--- a/spine-ts/webgl/src/SceneRenderer.ts
+++ b/spine-ts/webgl/src/SceneRenderer.ts
@@ -32,7 +32,7 @@ module spine.webgl {
 	export class SceneRenderer implements Disposable {
 		gl: WebGLRenderingContext;
 		canvas: HTMLCanvasElement;
-		camera: OrthoCamera;		
+		camera: OrthoCamera;
 		batcher: PolygonBatcher;
 		private batcherShader: Shader;
 		private shapes: ShapeRenderer;
@@ -125,10 +125,10 @@ module spine.webgl {
 			// bottom left and top right corner points relative to origin
 			let worldOriginX = x + pivotX;
 			let worldOriginY = y + pivotY;
-			let  fx = -pivotX;
-			let  fy = -pivotY;
-			let  fx2 = width - pivotX;
-			let  fy2 = height - pivotY;			
+			let fx = -pivotX;
+			let fy = -pivotY;
+			let fx2 = width - pivotX;
+			let fy2 = height - pivotY;
 
 			// construct corner points, start from top left and go counter clockwise
 			let p1x = fx;
@@ -305,13 +305,13 @@ module spine.webgl {
 		end () {
 			if (this.activeRenderer === this.batcher) this.batcher.end();
 			else if (this.activeRenderer === this.shapes) this.shapes.end();
-			this.activeRenderer = null;		
+			this.activeRenderer = null;
 		}
 
 		resize (resizeMode: ResizeMode) {
 			let canvas = this.canvas;
 			var w = canvas.clientWidth;
-			var h = canvas.clientHeight;	
+			var h = canvas.clientHeight;
 			if (canvas.width != w || canvas.height != h) {
 				canvas.width = w;
 				canvas.height = h;
@@ -329,7 +329,7 @@ module spine.webgl {
 				let sourceRatio = sourceHeight / sourceWidth;
 				let scale = targetRatio < sourceRatio ? targetWidth / sourceWidth : targetHeight / sourceHeight;
 				this.camera.viewportWidth = sourceWidth * scale;
-				this.camera.viewportHeight = sourceHeight * scale;				
+				this.camera.viewportHeight = sourceHeight * scale;
 			}
 			this.camera.update();
 		}
@@ -357,7 +357,7 @@ module spine.webgl {
 			this.batcherShader.dispose();
 			this.shapes.dispose();
 			this.shapesShader.dispose();
-			this.skeletonDebugRenderer.dispose();		
+			this.skeletonDebugRenderer.dispose();
 		}
 	}
 
diff --git a/spine-ts/webgl/src/Shader.ts b/spine-ts/webgl/src/Shader.ts
index 7682a6660..21d7b471f 100644
--- a/spine-ts/webgl/src/Shader.ts
+++ b/spine-ts/webgl/src/Shader.ts
@@ -183,7 +183,7 @@ module spine.webgl {
 				void main () {
 					v_color = ${Shader.COLOR};
 					v_texCoords = ${Shader.TEXCOORDS};
-					gl_Position =  ${Shader.MVP_MATRIX} * ${Shader.POSITION};
+					gl_Position = ${Shader.MVP_MATRIX} * ${Shader.POSITION};
 				}
 			`;
 
@@ -215,7 +215,7 @@ module spine.webgl {
 
 				void main () {
 					v_color = ${Shader.COLOR};
-					gl_Position =  ${Shader.MVP_MATRIX} * ${Shader.POSITION};
+					gl_Position = ${Shader.MVP_MATRIX} * ${Shader.POSITION};
 				}
 			`;
 
diff --git a/spine-ts/webgl/src/ShapeRenderer.ts b/spine-ts/webgl/src/ShapeRenderer.ts
index b5e486e1a..94e46c643 100644
--- a/spine-ts/webgl/src/ShapeRenderer.ts
+++ b/spine-ts/webgl/src/ShapeRenderer.ts
@@ -34,8 +34,8 @@ module spine.webgl {
 		private isDrawing = false;
 		private mesh: Mesh;
 		private shapeType = ShapeType.Filled;
-		private color = new Color(1, 1, 1, 1);		
-		private shader: Shader;		
+		private color = new Color(1, 1, 1, 1);
+		private shader: Shader;
 		private vertexIndex = 0;
 		private tmp = new Vector2();
 		private srcBlend: number = WebGLRenderingContext.SRC_ALPHA;
@@ -44,11 +44,11 @@ module spine.webgl {
 		constructor (gl: WebGLRenderingContext, maxVertices: number = 10920) {
 			if (maxVertices > 10920) throw new Error("Can't have more than 10920 triangles per batch: " + maxVertices);
 			this.gl = gl;
-			this.mesh = new Mesh(gl, [new Position2Attribute(), new ColorAttribute()], maxVertices, 0);			
+			this.mesh = new Mesh(gl, [new Position2Attribute(), new ColorAttribute()], maxVertices, 0);
 		}
 
 		begin (shader: Shader) {
-			if (this.isDrawing) throw new Error("ShapeRenderer.begin() has already been called");			
+			if (this.isDrawing) throw new Error("ShapeRenderer.begin() has already been called");
 			this.shader = shader;
 			this.vertexIndex = 0;
 			this.isDrawing = true;
@@ -56,7 +56,7 @@ module spine.webgl {
 			let gl = this.gl;
 			gl.enable(gl.BLEND);
 			gl.blendFunc(this.srcBlend, this.dstBlend);
-		}		
+		}
 
 		setBlendMode (srcBlend: number, dstBlend: number) {
 			let gl = this.gl;
@@ -74,21 +74,21 @@ module spine.webgl {
 
 		setColorWith (r: number, g: number, b: number, a: number) {
 			this.color.set(r, g, b, a);
-		}		
-
-		point (x: number, y: number, color: Color = null) {			
-			this.check(ShapeType.Point, 1);			
-			if (color === null) color = this.color;
-			this.vertex(x, y, color);						
 		}
 
-		line (x: number, y: number, x2: number, y2: number, color: Color = null) {			
+		point (x: number, y: number, color: Color = null) {
+			this.check(ShapeType.Point, 1);
+			if (color === null) color = this.color;
+			this.vertex(x, y, color);
+		}
+
+		line (x: number, y: number, x2: number, y2: number, color: Color = null) {
 			this.check(ShapeType.Line, 2);
 			let vertices = this.mesh.getVertices();
 			let idx = this.vertexIndex;
-			if (color === null) color = this.color;			
+			if (color === null) color = this.color;
 			this.vertex(x, y, color);
-			this.vertex(x2, y2, color);		
+			this.vertex(x2, y2, color);
 		}
 
 		triangle (filled: boolean, x: number, y: number, x2: number, y2: number, x3: number, y3: number, color: Color = null, color2: Color = null, color3: Color = null) {
@@ -98,7 +98,7 @@ module spine.webgl {
 			if (color === null) color = this.color;
 			if (color2 === null) color2 = this.color;
 			if (color3 === null) color3 = this.color;
-			if (filled) {		
+			if (filled) {
 				this.vertex(x, y, color);
 				this.vertex(x2, y2, color2);
 				this.vertex(x3, y3, color3);
@@ -124,13 +124,13 @@ module spine.webgl {
 			if (color4 === null) color4 = this.color;
 			if (filled) {
 				this.vertex(x, y, color); this.vertex(x2, y2, color2); this.vertex(x3, y3, color3);
-				this.vertex(x3, y3, color3); this.vertex(x4, y4, color4); this.vertex(x, y, color);				
+				this.vertex(x3, y3, color3); this.vertex(x4, y4, color4); this.vertex(x, y, color);
 			} else {
 				this.vertex(x, y, color); this.vertex(x2, y2, color2);
 				this.vertex(x2, y2, color2); this.vertex(x3, y3, color3);
 				this.vertex(x3, y3, color3); this.vertex(x4, y4, color4);
 				this.vertex(x4, y4, color4); this.vertex(x, y, color);
-			}			
+			}
 		}
 
 		rect (filled: boolean, x: number, y: number, width: number, height: number, color: Color = null) {
@@ -141,26 +141,26 @@ module spine.webgl {
 			this.check(filled ? ShapeType.Filled : ShapeType.Line, 8);
 			if (color === null) color = this.color;
 			let t = this.tmp.set(y2 - y1, x1 - x2);
-			t.normalize();		
+			t.normalize();
 			width *= 0.5;
 			let tx = t.x * width;
 			let ty = t.y * width;
 			if (!filled) {
 				this.vertex(x1 + tx, y1 + ty, color);
-				this.vertex(x1 - tx, y1 - ty, color);																
-				this.vertex(x2 + tx, y2 + ty, color);				
-				this.vertex(x2 - tx, y2 - ty, color);
-				
-				this.vertex(x2 + tx, y2 + ty, color);				
-				this.vertex(x1 + tx, y1 + ty, color);
-				
-				this.vertex(x2 - tx, y2 - ty, color);				
 				this.vertex(x1 - tx, y1 - ty, color);
-			} else {				
-				this.vertex(x1 + tx, y1 + ty, color);				
-				this.vertex(x1 - tx, y1 - ty, color);				
 				this.vertex(x2 + tx, y2 + ty, color);
-				
+				this.vertex(x2 - tx, y2 - ty, color);
+
+				this.vertex(x2 + tx, y2 + ty, color);
+				this.vertex(x1 + tx, y1 + ty, color);
+
+				this.vertex(x2 - tx, y2 - ty, color);
+				this.vertex(x1 - tx, y1 - ty, color);
+			} else {
+				this.vertex(x1 + tx, y1 + ty, color);
+				this.vertex(x1 - tx, y1 - ty, color);
+				this.vertex(x2 + tx, y2 + ty, color);
+
 				this.vertex(x2 - tx, y2 - ty, color);
 				this.vertex(x2 + tx, y2 + ty, color);
 				this.vertex(x1 - tx, y1 - ty, color);
@@ -203,7 +203,7 @@ module spine.webgl {
 
 				this.vertex(x1, y1, color);
 				this.vertex(x2, y2, color);
-			}			
+			}
 		}
 
 		circle (filled: boolean, x: number, y: number, radius: number, color: Color = null, segments: number = 0) {
@@ -217,7 +217,7 @@ module spine.webgl {
 			if (!filled) {
 				this.check(ShapeType.Line, segments * 2 + 2);
 				for (let i = 0; i < segments; i++) {
-					this.vertex(x + cx, y + cy, color);					
+					this.vertex(x + cx, y + cy, color);
 					let temp = cx;
 					cx = cos * cx - sin * cy;
 					cy = sin * temp + cos * cy;
@@ -229,8 +229,8 @@ module spine.webgl {
 				this.check(ShapeType.Filled, segments * 3 + 3);
 				segments--;
 				for (let i = 0; i < segments; i++) {
-					this.vertex(x, y, color);					
-					this.vertex(x + cx, y + cy, color);					
+					this.vertex(x, y, color);
+					this.vertex(x + cx, y + cy, color);
 					let temp = cx;
 					cx = cos * cx - sin * cy;
 					cy = sin * temp + cos * cy;
@@ -249,8 +249,8 @@ module spine.webgl {
 
 		curve (x1: number, y1: number, cx1: number, cy1: number, cx2: number, cy2: number, x2: number, y2: number, segments: number, color: Color = null) {
 			this.check(ShapeType.Line, segments * 2 + 2);
-			if (color === null) color = this.color;			
-			
+			if (color === null) color = this.color;
+
 			// Algorithm from: http://www.antigrain.com/research/bezier_interpolation/index.html#PAGE_BEZIER_INTERPOLATION
 			let subdiv_step = 1 / segments;
 			let subdiv_step2 = subdiv_step * subdiv_step;
@@ -302,7 +302,7 @@ module spine.webgl {
 			vertices[idx++] = color.g;
 			vertices[idx++] = color.b;
 			vertices[idx++] = color.a;
-			this.vertexIndex = idx;			
+			this.vertexIndex = idx;
 		}
 
 		end () {
@@ -316,13 +316,13 @@ module spine.webgl {
 			if (this.vertexIndex == 0) return;
 			this.mesh.setVerticesLength(this.vertexIndex);
 			this.mesh.draw(this.shader, this.shapeType);
-			this.vertexIndex = 0;			
+			this.vertexIndex = 0;
 		}
 
 		private check(shapeType: ShapeType, numVertices: number) {
 			if (!this.isDrawing) throw new Error("ShapeRenderer.begin() has not been called");
 			if (this.shapeType == shapeType) {
-				if (this.mesh.maxVertices() - this.mesh.numVertices() < numVertices) this.flush();				
+				if (this.mesh.maxVertices() - this.mesh.numVertices() < numVertices) this.flush();
 				else return;
 			} else {
 				this.flush();
@@ -331,7 +331,7 @@ module spine.webgl {
 		}
 
 		dispose () {
-			this.mesh.dispose();			
+			this.mesh.dispose();
 		}
 	}
 
diff --git a/spine-ts/webgl/src/SkeletonDebugRenderer.ts b/spine-ts/webgl/src/SkeletonDebugRenderer.ts
index f6ff79702..ceb9444e2 100644
--- a/spine-ts/webgl/src/SkeletonDebugRenderer.ts
+++ b/spine-ts/webgl/src/SkeletonDebugRenderer.ts
@@ -46,27 +46,27 @@ module spine.webgl {
 		premultipliedAlpha = false;
 		scale = 1;
 		boneWidth = 2;
-		
-		private gl: WebGLRenderingContext;		
+
+		private gl: WebGLRenderingContext;
 		private bounds = new SkeletonBounds();
 		private temp = new Array<number>();
 		private static LIGHT_GRAY = new Color(192 / 255, 192 / 255, 192 / 255, 1);
 		private static GREEN = new Color(0, 1, 0, 1);
-		
+
 		constructor (gl: WebGLRenderingContext) {
-			this.gl = gl;			
+			this.gl = gl;
 		}
 
 		draw (shapes: ShapeRenderer, skeleton: Skeleton, ignoredBones: Array<string> = null) {
 			let skeletonX = skeleton.x;
 			let skeletonY = skeleton.y;
-			let gl = this.gl;									
+			let gl = this.gl;
 			let srcFunc = this.premultipliedAlpha ? gl.ONE : gl.SRC_ALPHA;
-			shapes.setBlendMode(srcFunc, gl.ONE_MINUS_SRC_ALPHA);				
+			shapes.setBlendMode(srcFunc, gl.ONE_MINUS_SRC_ALPHA);
 
 			let bones = skeleton.bones;
 			if (this.drawBones) {
-				shapes.setColor(this.boneLineColor);				
+				shapes.setColor(this.boneLineColor);
 				for (let i = 0, n = bones.length; i < n; i++) {
 					let bone = bones[i];
 					if (ignoredBones && ignoredBones.indexOf(bone.data.name) > -1) continue;
@@ -74,7 +74,7 @@ module spine.webgl {
 					let x = skeletonX + bone.data.length * bone.a + bone.worldX;
 					let y = skeletonY + bone.data.length * bone.c + bone.worldY;
 					shapes.rectLine(true, skeletonX + bone.worldX, skeletonY + bone.worldY, x, y, this.boneWidth * this.scale);
-				}				
+				}
 				if (this.drawSkeletonXY) shapes.x(skeletonX, skeletonY, 4 * this.scale);
 			}
 
@@ -180,19 +180,19 @@ module spine.webgl {
 						y1 = y2;
 					}
 				}
-			}			
+			}
 
 			if (this.drawBones) {
 				shapes.setColor(this.boneOriginColor);
 				for (let i = 0, n = bones.length; i < n; i++) {
 					let bone = bones[i];
-					if (ignoredBones && ignoredBones.indexOf(bone.data.name) > -1) continue;				
+					if (ignoredBones && ignoredBones.indexOf(bone.data.name) > -1) continue;
 					shapes.circle(true, skeletonX + bone.worldX, skeletonY + bone.worldY, 3 * this.scale, SkeletonDebugRenderer.GREEN, 8);
 				}
-			}			
+			}
 		}
 
-		dispose () {			
+		dispose () {
 		}
 	}
 }
diff --git a/spine-ts/webgl/src/SkeletonRenderer.ts b/spine-ts/webgl/src/SkeletonRenderer.ts
index 3c0fb45fe..d2a3dda56 100644
--- a/spine-ts/webgl/src/SkeletonRenderer.ts
+++ b/spine-ts/webgl/src/SkeletonRenderer.ts
@@ -37,14 +37,14 @@ module spine.webgl {
 
 		constructor (gl: WebGLRenderingContext) {
 			this.gl = gl;
-		}		
+		}
 
 		draw (batcher: PolygonBatcher, skeleton: Skeleton) {
 			let premultipliedAlpha = this.premultipliedAlpha;
 			let blendMode: BlendMode = null;
 
 			let vertices: ArrayLike<number> = null;
-			let triangles: Array<number>  = null;
+			let triangles: Array<number> = null;
 			let drawOrder = skeleton.drawOrder;
 			for (let i = 0, n = drawOrder.length; i < n; i++) {
 				let slot = drawOrder[i];
diff --git a/spine-ts/widget/src/Widget.ts b/spine-ts/widget/src/Widget.ts
index 52285a071..8c706c44f 100644
--- a/spine-ts/widget/src/Widget.ts
+++ b/spine-ts/widget/src/Widget.ts
@@ -29,7 +29,7 @@
  *****************************************************************************/
 
 module spine {
-	export class SpineWidget {		
+	export class SpineWidget {
 		skeleton: Skeleton;
 		state: AnimationState;
 		gl: WebGLRenderingContext;
@@ -41,9 +41,9 @@ module spine {
 		private shader: spine.webgl.Shader;
 		private batcher: spine.webgl.PolygonBatcher;
 		private shapes: spine.webgl.ShapeRenderer;
-		private debugShader: spine.webgl.Shader;		
+		private debugShader: spine.webgl.Shader;
 		private mvp = new spine.webgl.Matrix4();
-		private skeletonRenderer: spine.webgl.SkeletonRenderer;		
+		private skeletonRenderer: spine.webgl.SkeletonRenderer;
 		private paused = false;
 		private lastFrameTime = Date.now() / 1000.0;
 		private backgroundColor = new Color();
@@ -67,7 +67,7 @@ module spine {
 			canvas.width = (<HTMLElement>element).clientWidth;
 			canvas.height = (<HTMLElement>element).clientHeight;
 			var webglConfig = { alpha: false };
-			let gl = this.gl = <WebGLRenderingContext> (canvas.getContext("webgl", webglConfig) || canvas.getContext("experimental-webgl", webglConfig));	
+			let gl = this.gl = <WebGLRenderingContext> (canvas.getContext("webgl", webglConfig) || canvas.getContext("experimental-webgl", webglConfig));
 
 			this.shader = spine.webgl.Shader.newColoredTextured(gl);
 			this.batcher = new spine.webgl.PolygonBatcher(gl);
@@ -92,8 +92,8 @@ module spine {
 			if (!config.scale) config.scale = 1.0;
 			if (!config.skin) config.skin = "default";
 			if (config.loop === undefined) config.loop = true;
-			if (!config.x) config.x = 0;		
-			if (!config.y) config.y = 0;									
+			if (!config.x) config.x = 0;
+			if (!config.y) config.y = 0;
 			if (config.fitToCanvas === undefined) config.fitToCanvas = true;
 			if (!config.backgroundColor) config.backgroundColor = "#555555";
 			if (!config.imagesPath) {
@@ -107,7 +107,7 @@ module spine {
 			if (!config.premultipliedAlpha === undefined) config.premultipliedAlpha = false;
 			if (!config.debug === undefined) config.debug = false;
 			this.backgroundColor.setFromString(config.backgroundColor);
-			this.config = config;		
+			this.config = config;
 		}
 
 		private load () {
@@ -124,10 +124,10 @@ module spine {
 					let texture = assetManager.get(imagesPath + path) as spine.webgl.GLTexture;
 					return texture;
 				});
-				
-				let atlasLoader = new spine.AtlasAttachmentLoader(atlas);				
+
+				let atlasLoader = new spine.AtlasAttachmentLoader(atlas);
 				var skeletonJson = new spine.SkeletonJson(atlasLoader);
-				
+
 				// Set the scale to apply during parsing, parse the file, and create a new skeleton.
 				skeletonJson.scale = config.scale;
 				var skeletonData = skeletonJson.readSkeletonData(assetManager.get(config.json) as string);
@@ -140,7 +140,7 @@ module spine {
 				if (!config.fitToCanvas) {
 					skeleton.x = config.x;
 					skeleton.y = config.y;
-				}				
+				}
 
 				var animationState = this.state = new spine.AnimationState(new spine.AnimationStateData(skeleton.data));
 				animationState.setAnimation(0, config.animation, true);
@@ -151,7 +151,7 @@ module spine {
 				requestAnimationFrame(() => { this.load(); });
 		}
 
-		private render () {			
+		private render () {
 			var now = Date.now() / 1000;
 			var delta = now - this.lastFrameTime;
 			if (delta > 0.1) delta = 0;
@@ -170,18 +170,18 @@ module spine {
 			state.update(delta);
 			state.apply(skeleton);
 			skeleton.updateWorldTransform();
-			
+
 			// Draw the skeleton
 			let shader = this.shader;
 			let batcher = this.batcher;
 			let skeletonRenderer = this.skeletonRenderer;
 			shader.bind();
 			shader.setUniformi(spine.webgl.Shader.SAMPLER, 0);
-			shader.setUniform4x4f(spine.webgl.Shader.MVP_MATRIX, this.mvp.values);			
+			shader.setUniform4x4f(spine.webgl.Shader.MVP_MATRIX, this.mvp.values);
 			batcher.begin(shader);
 			skeletonRenderer.premultipliedAlpha = premultipliedAlpha;
 			skeletonRenderer.draw(batcher, skeleton);
-			batcher.end();				
+			batcher.end();
 			shader.unbind();
 
 			// Draw debug information if requested via config
@@ -202,7 +202,7 @@ module spine {
 		}
 
 		private resize () {
-			let canvas = this.canvas;	
+			let canvas = this.canvas;
 			let w = canvas.clientWidth;
 			let h = canvas.clientHeight;
 			let bounds = this.bounds;
@@ -227,7 +227,7 @@ module spine {
 				this.mvp.ortho2d(0, 0, canvas.width - 1, canvas.height - 1);
 			}
 
-			this.gl.viewport(0, 0, canvas.width, canvas.height);		
+			this.gl.viewport(0, 0, canvas.width, canvas.height);
 		}
 
 		pause () {
@@ -253,7 +253,7 @@ module spine {
 		static loadWidgets() {
 			let widgets = document.getElementsByClassName("spine-widget");
 			for (var i = 0; i < widgets.length; i++) {
-				SpineWidget.loadWidget(<HTMLElement>widgets[i]);				
+				SpineWidget.loadWidget(<HTMLElement>widgets[i]);
 			}
 		}
 
@@ -262,16 +262,16 @@ module spine {
 			config.atlas = widget.getAttribute("data-atlas");
 			config.json = widget.getAttribute("data-json");
 			config.animation = widget.getAttribute("data-animation");
-			if (widget.getAttribute("data-images-path")) config.imagesPath = widget.getAttribute("data-images-path");			
+			if (widget.getAttribute("data-images-path")) config.imagesPath = widget.getAttribute("data-images-path");
 			if (widget.getAttribute("data-skin")) config.skin = widget.getAttribute("data-skin");
 			if (widget.getAttribute("data-loop")) config.loop = widget.getAttribute("data-loop") === "true";
 			if (widget.getAttribute("data-scale")) config.scale = parseFloat(widget.getAttribute("data-scale"));
 			if (widget.getAttribute("data-x")) config.x = parseFloat(widget.getAttribute("data-x"));
 			if (widget.getAttribute("data-y")) config.y = parseFloat(widget.getAttribute("data-y"));
-			if (widget.getAttribute("data-fit-to-canvas")) config.fitToCanvas = widget.getAttribute("data-fit-to-canvas") === "true";							
+			if (widget.getAttribute("data-fit-to-canvas")) config.fitToCanvas = widget.getAttribute("data-fit-to-canvas") === "true";
 			if (widget.getAttribute("data-background-color")) config.backgroundColor = widget.getAttribute("data-background-color");
 			if (widget.getAttribute("data-premultiplied-alpha")) config.premultipliedAlpha = widget.getAttribute("data-premultiplied-alpha") === "true";
-			if (widget.getAttribute("data-debug")) config.debug = widget.getAttribute("data-debug") === "true";			
+			if (widget.getAttribute("data-debug")) config.debug = widget.getAttribute("data-debug") === "true";
 
 			new spine.SpineWidget(widget, config);
 		}
@@ -300,18 +300,18 @@ module spine {
 		json: string;
 		atlas: string;
 		animation: string;
-		imagesPath: string;		
-		skin = "default";		
+		imagesPath: string;
+		skin = "default";
 		loop = true;
 		scale = 1.0;
 		x = 0;
 		y = 0;
-		fitToCanvas = true;		
+		fitToCanvas = true;
 		backgroundColor = "#555555";
 		premultipliedAlpha = false;
-		debug = false;	
+		debug = false;
 		success: (widget: SpineWidget) => void;
-		error: (widget: SpineWidget, msg: string) => void;		
+		error: (widget: SpineWidget, msg: string) => void;
 	}
 }
 spine.SpineWidget.setupDOMListener();