diff --git a/README.md b/README.md
index 7ee9f12..a4e828c 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,14 @@ JavaScript:
 // doesn't specify a channel name, so it defaults to "/" (DEFAULT_CHANNEL)
 var channel = postal.channel( { topic: "Name.Changed" } );
 
+// this call is identical to the one above
+var channel = postal.channel( "Name.Changed" )
+
+// To specify a channel name you can do one of the following
+var channel = postal.channel( { channel: "MyChannel", topic: "MyTopic" } );
+var channel = postal.channel( "MyChannel","MyTopic" );
+
+
 // subscribe
 var subscription = channel.subscribe( function( data, envelope ) {
 	$( "#example1" ).html( "Name: " + data.name );
@@ -60,13 +68,18 @@ var starChannel = postal.channel( { channel: "Doctor.Who", topic: "DrWho.*.Chang
     starSubscription = starChannel.subscribe( function( data ) {
         $( '<li>' + data.type + " Changed: " + data.value + '</li>' ).appendTo( "#example3" );
     });
-// demonstrating how we're re-using the channel delcared above to publish, but overriding the topic in the second argument
-starChannel.publish( { type: "Name", value:"Rose"   }, { topic: "DrWho.NinthDoctor.Companion.Changed" } );
-starChannel.publish( { type: "Name", value:"Martha" }, { topic: "DrWho.TenthDoctor.Companion.Changed" } );
-starChannel.publish( { type: "Name", value:"Amy"    }, { topic: "DrWho.Eleventh.Companion.Changed" } );
-starChannel.publish( { type: "Location", value: "The Library" }, { topic: "DrWho.Location.Changed" } );
-starChannel.publish( { type: "DrumBeat", value: "This won't trigger any subscriptions" }, { topic: "TheMaster.DrumBeat.Changed" } );
-starChannel.publish( { type: "Useless", value: "This won't trigger any subscriptions either" }, { topic: "Changed" } );
+/*
+	demonstrating how we're re-using the channel delcared above to publish, but overriding the topic in the second argument
+	note to override the topic, you have to use the "envelope" structure, which means an object like:
+	{ channel: "myChannel", topic: "myTopic", data: { someProp: "SomeVal, moarData: "MoarValue" } };
+	The only thing to note is that since we are publishing from a channel definition, you don't need to pass "channel" (in fact, it would be ignored)
+*/
+starChannel.publish( { topic: "DrWho.NinthDoctor.Companion.Changed", data: { type: "Name", value:"Rose"   } } );
+starChannel.publish( { topic: "DrWho.TenthDoctor.Companion.Changed", data: { type: "Name", value:"Martha" } } );
+starChannel.publish( { topic: "DrWho.Eleventh.Companion.Changed",    data: { type: "Name", value:"Amy"    } } );
+starChannel.publish( { topic: "DrWho.Location.Changed",              data: { type: "Location", value: "The Library" } } );
+starChannel.publish( { topic: "TheMaster.DrumBeat.Changed",          data: { type: "DrumBeat", value: "This won't trigger any subscriptions" } } );
+starChannel.publish( { topic: "Changed",                             data: { type: "Useless", value: "This won't trigger any subscriptions either" } } );
 
 starSubscription.unsubscribe();
 ```
@@ -79,7 +92,7 @@ var dupChannel = postal.channel( { topic: "WeepingAngel.*" } ),
                           $( '<li>' + data.value + '</li>' ).appendTo( "#example4" );
                       }).ignoreDuplicates();
 // demonstrating multiple channels per topic being used
-// You can do it this way if you like, but the example above has nicer syntax (and less overhead)
+// You can do it this way if you like, but the example above has nicer syntax (and *much* less overhead)
 postal.channel( { topic: "WeepingAngel.DontBlink" } )
       .publish( { value:"Don't Blink" } );
 postal.channel( { topic: "WeepingAngel.DontBlink" } )
diff --git a/build-browser-standard-diags.json b/build-browser-diags.json
similarity index 77%
rename from build-browser-standard-diags.json
rename to build-browser-diags.json
index bcef85f..9f41844 100644
--- a/build-browser-standard-diags.json
+++ b/build-browser-diags.json
@@ -1,6 +1,6 @@
 {
     "source": "src/diags",
-    "output": "lib/browser/standard",
+    "output": "lib/browser",
     "lint": {},
     "uglify": {},
     "gzip": {},
diff --git a/build-browser-standard.json b/build-browser.json
similarity index 77%
rename from build-browser-standard.json
rename to build-browser.json
index 63711c5..79d48de 100644
--- a/build-browser-standard.json
+++ b/build-browser.json
@@ -1,6 +1,6 @@
 {
     "source": "src/main",
-    "output": "lib/browser/standard",
+    "output": "lib/browser",
     "lint": {},
     "uglify": {},
     "gzip": {},
diff --git a/lib/browser/standard/postal.diagnostics.js b/lib/browser/standard/postal.diagnostics.js
deleted file mode 100644
index 5defd32..0000000
--- a/lib/browser/standard/postal.diagnostics.js
+++ /dev/null
@@ -1,33 +0,0 @@
-(function(root, doc, factory) {
-	if (typeof define === "function" && define.amd) {
-		// AMD. Register as an anonymous module.
-		define(["postal", "underscore"], function(postal, _) {
-			return factory(postal, _, root, doc);
-		});
-	} else {
-		// Browser globals
-		factory(root.postal, root._, root, doc);
-	}
-}(this, document, function(postal, _, global, document, undefined) {
-
-	// this returns a callback that, if invoked, removes the wireTap
-	return postal.addWireTap(function(data, envelope) {
-		var all = _.extend(envelope, { data: data });
-		if(!JSON) {
-			throw "This browser or environment does not provide JSON support";
-		}
-		try {
-			console.log(JSON.stringify(all));
-		}
-		catch(exception) {
-			try {
-				all.data = "ERROR: " + exception.message;
-				console.log(JSON.stringify(all));
-			}
-			catch(ex) {
-				console.log("Unable to parse data to JSON: " + exception);
-			}
-		}
-	});
-
-}));
\ No newline at end of file
diff --git a/lib/browser/standard/postal.diagnostics.min.gz.js b/lib/browser/standard/postal.diagnostics.min.gz.js
deleted file mode 100644
index 8fe66f7..0000000
Binary files a/lib/browser/standard/postal.diagnostics.min.gz.js and /dev/null differ
diff --git a/lib/browser/standard/postal.diagnostics.min.js b/lib/browser/standard/postal.diagnostics.min.js
deleted file mode 100644
index 6dffe94..0000000
--- a/lib/browser/standard/postal.diagnostics.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a,b,c){typeof define=="function"&&define.amd?define(["postal","underscore"],function(d,e){return c(d,e,a,b)}):c(a.postal,a._,a,b)})(this,document,function(a,b,c,d,e){return a.addWireTap(function(a,c){var d=b.extend(c,{data:a});if(!JSON)throw"This browser or environment does not provide JSON support";try{console.log(JSON.stringify(d))}catch(e){try{d.data="ERROR: "+e.message,console.log(JSON.stringify(d))}catch(f){console.log("Unable to parse data to JSON: "+e)}}})})
\ No newline at end of file
diff --git a/lib/browser/standard/postal.js b/lib/browser/standard/postal.js
deleted file mode 100644
index 7791255..0000000
--- a/lib/browser/standard/postal.js
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
-    postal.js
-    Author: Jim Cowart
-    License: Dual licensed MIT (http://www.opensource.org/licenses/mit-license) & GPL (http://www.opensource.org/licenses/gpl-license)
-    Version 0.6.0
-*/
-
-(function(root, doc, factory) {
-	if (typeof define === "function" && define.amd) {
-		// AMD. Register as an anonymous module.
-		define(["underscore"], function(_) {
-			return factory(_, root, doc);
-		});
-	} else {
-		// Browser globals
-		factory(root._, root, doc);
-	}
-}(this, document, function(_, global, document, undefined) {
-
-var DEFAULT_CHANNEL = "/",
-    DEFAULT_PRIORITY = 50,
-    DEFAULT_DISPOSEAFTER = 0,
-    SYSTEM_CHANNEL = "postal",
-    NO_OP = function() { };
-
-var DistinctPredicate = function() {
-    var previous;
-    return function(data) {
-        var eq = false;
-        if(_.isString(data)) {
-            eq = data === previous;
-            previous = data;
-        }
-        else {
-            eq = _.isEqual(data, previous);
-            previous = _.clone(data);
-        }
-        return !eq;
-    };
-};
-
-var ChannelDefinition = function(channelName, defaultTopic) {
-    this.channel = channelName || DEFAULT_CHANNEL;
-    this._topic = defaultTopic || "";
-};
-
-ChannelDefinition.prototype = {
-    subscribe: function() {
-        var len = arguments.length;
-	    if(len === 1) {
-		    return new SubscriptionDefinition(this.channel, this._topic, arguments[0]);
-	    }
-	    else if (len === 2) {
-		    return new SubscriptionDefinition(this.channel, arguments[0], arguments[1]);
-	    }
-    },
-
-    publish: function(obj) {
-	    var envelope = {
-		    channel: this.channel,
-		    topic: this._topic,
-		    data: obj
-	    };
-	    // If this is an envelope....
-	    if( obj.topic && obj.data ) {
-		    envelope = obj;
-		    envelope.channel = envelope.channel || this.channel;
-	    }
-	    envelope.timeStamp = new Date();
-		postal.configuration.bus.publish(envelope);
-    },
-
-	topic: function(topic) {
-		if(topic === this._topic) {
-			return this;
-		}
-		return new ChannelDefinition(this.channel, topic);
-	}
-};
-
-var SubscriptionDefinition = function(channel, topic, callback) {
-	this.channel = channel;
-	this.topic = topic;
-	this.callback = callback;
-	this.priority = DEFAULT_PRIORITY;
-	this.constraints = new Array(0);
-	this.maxCalls = DEFAULT_DISPOSEAFTER;
-	this.onHandled = NO_OP;
-	this.context = null;
-	postal.configuration.bus.publish({
-			channel: SYSTEM_CHANNEL,
-			topic: "subscription.created",
-			timeStamp: new Date(),
-			data: {
-				event: "subscription.created",
-				channel: channel,
-				topic: topic
-			}
-	});
-
-	postal.configuration.bus.subscribe(this);
-
-};
-
-SubscriptionDefinition.prototype = {
-	unsubscribe: function() {
-		postal.configuration.bus.unsubscribe(this);
-		postal.configuration.bus.publish({
-			channel: SYSTEM_CHANNEL,
-			topic: "subscription.removed",
-			timeStamp: new Date(),
-			data: {
-				event: "subscription.removed",
-				channel: this.channel,
-				topic: this.topic
-			}
-		});
-	},
-
-	defer: function() {
-		var fn = this.callback;
-		this.callback = function(data) {
-			setTimeout(fn,0,data);
-		};
-		return this;
-	},
-
-	disposeAfter: function(maxCalls) {
-		if(_.isNaN(maxCalls) || maxCalls <= 0) {
-			throw "The value provided to disposeAfter (maxCalls) must be a number greater than zero.";
-		}
-
-		var fn = this.onHandled;
-		var dispose = _.after(maxCalls, _.bind(function() {
-			this.unsubscribe(this);
-		}, this));
-
-		this.onHandled = function() {
-			fn.apply(this.context, arguments);
-			dispose();
-		};
-		return this;
-	},
-
-	ignoreDuplicates: function() {
-		this.withConstraint(new DistinctPredicate());
-		return this;
-	},
-
-	whenHandledThenExecute: function(callback) {
-		if(! _.isFunction(callback)) {
-			throw "Value provided to 'whenHandledThenExecute' must be a function";
-		}
-		this.onHandled = callback;
-		return this;
-	},
-
-	withConstraint: function(predicate) {
-		if(! _.isFunction(predicate)) {
-			throw "Predicate constraint must be a function";
-		}
-		this.constraints.push(predicate);
-		return this;
-	},
-
-	withConstraints: function(predicates) {
-		var self = this;
-		if(_.isArray(predicates)) {
-			_.each(predicates, function(predicate) { self.withConstraint(predicate); } );
-		}
-		return self;
-	},
-
-	withContext: function(context) {
-		this.context = context;
-		return this;
-	},
-
-	withDebounce: function(milliseconds) {
-		if(_.isNaN(milliseconds)) {
-			throw "Milliseconds must be a number";
-		}
-		var fn = this.callback;
-		this.callback = _.debounce(fn, milliseconds);
-		return this;
-	},
-
-	withDelay: function(milliseconds) {
-		if(_.isNaN(milliseconds)) {
-			throw "Milliseconds must be a number";
-		}
-		var fn = this.callback;
-		this.callback = function(data) {
-			setTimeout(fn, milliseconds, data);
-		};
-		return this;
-	},
-
-	withPriority: function(priority) {
-		if(_.isNaN(priority)) {
-			throw "Priority must be a number";
-		}
-		this.priority = priority;
-		return this;
-	},
-
-	withThrottle: function(milliseconds) {
-		if(_.isNaN(milliseconds)) {
-			throw "Milliseconds must be a number";
-		}
-		var fn = this.callback;
-		this.callback = _.throttle(fn, milliseconds);
-		return this;
-	},
-
-	subscribe: function(callbacl) {
-		this.callback = callback;
-		return this;
-	}
-};
-
-var bindingsResolver = {
-    cache: { },
-
-    compare: function(binding, topic) {
-        if(this.cache[topic] && this.cache[topic][binding]) {
-            return true;
-        }
-	    //  binding.replace(/\./g,"\\.")             // escape actual periods
-	    //         .replace(/\*/g, ".*")             // asterisks match any value
-	    //         .replace(/#/g, "[A-Z,a-z,0-9]*"); // hash matches any alpha-numeric 'word'
-        var rgx = new RegExp("^" + binding.replace(/\./g,"\\.").replace(/\*/g, ".*").replace(/#/g, "[A-Z,a-z,0-9]*") + "$"),
-            result = rgx.test(topic);
-        if(result) {
-            if(!this.cache[topic]) {
-                this.cache[topic] = {};
-            }
-            this.cache[topic][binding] = true;
-        }
-        return result;
-    }
-};
-
-var localBus = {
-
-	subscriptions: {},
-
-	wireTaps: new Array(0),
-
-	publish: function(envelope) {
-		_.each(this.wireTaps,function(tap) {
-			tap(envelope.data, envelope);
-		});
-
-		_.each(this.subscriptions[envelope.channel], function(topic) {
-			_.each(topic, function(subDef){
-				if(postal.configuration.resolver.compare(subDef.topic, envelope.topic)) {
-					if(_.all(subDef.constraints, function(constraint) { return constraint(envelope.data); })) {
-						if(typeof subDef.callback === 'function') {
-							subDef.callback.apply(subDef.context, [envelope.data, envelope]);
-							subDef.onHandled();
-						}
-					}
-				}
-			});
-		});
-	},
-
-	subscribe: function(subDef) {
-		var idx, found, fn, channel = this.subscriptions[subDef.channel], subs;
-
-		if(!channel) {
-			channel = this.subscriptions[subDef.channel] = {};
-		}
-		subs = this.subscriptions[subDef.channel][subDef.topic];
-		if(!subs) {
-			subs = this.subscriptions[subDef.channel][subDef.topic] = new Array(0);
-		}
-
-		idx = subs.length - 1;
-		for(; idx >= 0; idx--) {
-			if(subs[idx].priority <= subDef.priority) {
-				subs.splice(idx + 1, 0, subDef);
-				found = true;
-				break;
-			}
-		}
-		if(!found) {
-			subs.unshift(subDef);
-		}
-		return subDef;
-	},
-
-	unsubscribe: function(config) {
-		if(this.subscriptions[config.channel][config.topic]) {
-			var len = this.subscriptions[config.channel][config.topic].length,
-				idx = 0;
-			for ( ; idx < len; idx++ ) {
-				if (this.subscriptions[config.channel][config.topic][idx] === config) {
-					this.subscriptions[config.channel][config.topic].splice( idx, 1 );
-					break;
-				}
-			}
-		}
-	},
-
-	addWireTap: function(callback) {
-		var self = this;
-		self.wireTaps.push(callback);
-		return function() {
-			var idx = self.wireTaps.indexOf(callback);
-			if(idx !== -1) {
-				self.wireTaps.splice(idx,1);
-			}
-		};
-	}
-};
-
-var publishPicker = {
-	"1" : function(envelope) {
-		if(!envelope) {
-			throw new Error("publishing from the 'global' postal.publish call requires a valid envelope.");
-		}
-		envelope.channel = envelope.channel || DEFAULT_CHANNEL;
-		envelope.timeStamp = new Date();
-		postal.configuration.bus.publish(envelope);
-	},
-	"2" : function(topic, data) {
-		postal.configuration.bus.publish({ channel: DEFAULT_CHANNEL, topic: topic, timeStamp: new Date(), data: data });
-	},
-	"3" : function(channel, topic, data) {
-		postal.configuration.bus.publish({ channel: channel, topic: topic, timeStamp: new Date(), data: data });
-	}
-};
-
-// save some setup time, albeit tiny
-localBus.subscriptions[SYSTEM_CHANNEL] = {};
-
-var postal = {
-	configuration: {
-		bus: localBus,
-		resolver: bindingsResolver
-	},
-
-	channel: function() {
-		var len = arguments.length,
-			channel = arguments[0],
-			tpc = arguments[1];
-		if(len === 1) {
-			if(Object.prototype.toString.call(channel) === "[object String]") {
-				channel = DEFAULT_CHANNEL;
-				tpc = arguments[0];
-			}
-			else {
-				channel = arguments[0].channel || DEFAULT_CHANNEL;
-				tpc = arguments[0].topic;
-			}
-		}
-		return new ChannelDefinition(channel, tpc);
-	},
-
-	subscribe: function(options) {
-		var callback = options.callback,
-			topic = options.topic,
-			channel = options.channel || DEFAULT_CHANNEL;
-		return new SubscriptionDefinition(channel, topic, callback);
-	},
-
-	publish: function() {
-		var len = arguments.length;
-		if(publishPicker[len]) {
-			publishPicker[len].apply(this, arguments);
-		}
-	},
-
-	addWireTap: function(callback) {
-		return this.configuration.bus.addWireTap(callback);
-	},
-
-	linkChannels: function(sources, destinations) {
-		var result = [];
-		if(!_.isArray(sources)) {
-			sources = [sources];
-		}
-		if(!_.isArray(destinations)) {
-			destinations = [destinations];
-		}
-		_.each(sources, function(source){
-			var sourceTopic = source.topic || "*";
-			_.each(destinations, function(destination) {
-				var destChannel = destination.channel || DEFAULT_CHANNEL;
-				result.push(
-					postal.subscribe({
-						channel: source.channel || DEFAULT_CHANNEL,
-						topic: source.topic || "*",
-						callback : function(data, env) {
-							var newEnv = env;
-							newEnv.topic = _.isFunction(destination.topic) ? destination.topic(env.topic) : destination.topic || env.topic;
-							newEnv.channel = destChannel;
-							newEnv.data = data;
-							postal.publish(newEnv);
-						}
-					})
-				);
-			});
-		});
-		return result;
-	}
-};
-
-
-	global.postal = postal;
-	return postal;
-}));
\ No newline at end of file
diff --git a/lib/browser/standard/postal.min.gz.js b/lib/browser/standard/postal.min.gz.js
deleted file mode 100644
index f93772f..0000000
Binary files a/lib/browser/standard/postal.min.gz.js and /dev/null differ
diff --git a/lib/browser/standard/postal.min.js b/lib/browser/standard/postal.min.js
deleted file mode 100644
index 4ad9154..0000000
--- a/lib/browser/standard/postal.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a,b,c){typeof define=="function"&&define.amd?define(["underscore"],function(d){return c(d,a,b)}):c(a._,a,b)})(this,document,function(a,b,c,d){var e="/",f=50,g=0,h="postal",i=function(){},j=function(){var b;return function(c){var d=!1;return a.isString(c)?(d=c===b,b=c):(d=a.isEqual(c,b),b=a.clone(c)),!d}},k=function(a,b){this.channel=a||e,this._topic=b||""};k.prototype={subscribe:function(){var a=arguments.length;if(a===1)return new l(this.channel,this._topic,arguments[0]);if(a===2)return new l(this.channel,arguments[0],arguments[1])},publish:function(a){var b={channel:this.channel,topic:this._topic,data:a};a.topic&&a.data&&(b=a,b.channel=b.channel||this.channel),b.timeStamp=new Date,p.configuration.bus.publish(b)},topic:function(a){return a===this._topic?this:new k(this.channel,a)}};var l=function(a,b,c){this.channel=a,this.topic=b,this.callback=c,this.priority=f,this.constraints=new Array(0),this.maxCalls=g,this.onHandled=i,this.context=null,p.configuration.bus.publish({channel:h,topic:"subscription.created",timeStamp:new Date,data:{event:"subscription.created",channel:a,topic:b}}),p.configuration.bus.subscribe(this)};l.prototype={unsubscribe:function(){p.configuration.bus.unsubscribe(this),p.configuration.bus.publish({channel:h,topic:"subscription.removed",timeStamp:new Date,data:{event:"subscription.removed",channel:this.channel,topic:this.topic}})},defer:function(){var a=this.callback;return this.callback=function(b){setTimeout(a,0,b)},this},disposeAfter:function(b){if(a.isNaN(b)||b<=0)throw"The value provided to disposeAfter (maxCalls) must be a number greater than zero.";var c=this.onHandled,d=a.after(b,a.bind(function(){this.unsubscribe(this)},this));return this.onHandled=function(){c.apply(this.context,arguments),d()},this},ignoreDuplicates:function(){return this.withConstraint(new j),this},whenHandledThenExecute:function(b){if(!a.isFunction(b))throw"Value provided to 'whenHandledThenExecute' must be a function";return this.onHandled=b,this},withConstraint:function(b){if(!a.isFunction(b))throw"Predicate constraint must be a function";return this.constraints.push(b),this},withConstraints:function(b){var c=this;return a.isArray(b)&&a.each(b,function(a){c.withConstraint(a)}),c},withContext:function(a){return this.context=a,this},withDebounce:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=a.debounce(c,b),this},withDelay:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=function(a){setTimeout(c,b,a)},this},withPriority:function(b){if(a.isNaN(b))throw"Priority must be a number";return this.priority=b,this},withThrottle:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=a.throttle(c,b),this},subscribe:function(a){return this.callback=callback,this}};var m={cache:{},compare:function(a,b){if(this.cache[b]&&this.cache[b][a])return!0;var c=new RegExp("^"+a.replace(/\./g,"\\.").replace(/\*/g,".*").replace(/#/g,"[A-Z,a-z,0-9]*")+"$"),d=c.test(b);return d&&(this.cache[b]||(this.cache[b]={}),this.cache[b][a]=!0),d}},n={subscriptions:{},wireTaps:new Array(0),publish:function(b){a.each(this.wireTaps,function(a){a(b.data,b)}),a.each(this.subscriptions[b.channel],function(c){a.each(c,function(c){p.configuration.resolver.compare(c.topic,b.topic)&&a.all(c.constraints,function(a){return a(b.data)})&&typeof c.callback=="function"&&(c.callback.apply(c.context,[b.data,b]),c.onHandled())})})},subscribe:function(a){var b,c,d,e=this.subscriptions[a.channel],f;e||(e=this.subscriptions[a.channel]={}),f=this.subscriptions[a.channel][a.topic],f||(f=this.subscriptions[a.channel][a.topic]=new Array(0)),b=f.length-1;for(;b>=0;b--)if(f[b].priority<=a.priority){f.splice(b+1,0,a),c=!0;break}return c||f.unshift(a),a},unsubscribe:function(a){if(this.subscriptions[a.channel][a.topic]){var b=this.subscriptions[a.channel][a.topic].length,c=0;for(;c<b;c++)if(this.subscriptions[a.channel][a.topic][c]===a){this.subscriptions[a.channel][a.topic].splice(c,1);break}}},addWireTap:function(a){var b=this;return b.wireTaps.push(a),function(){var c=b.wireTaps.indexOf(a);c!==-1&&b.wireTaps.splice(c,1)}}},o={1:function(a){if(!a)throw new Error("publishing from the 'global' postal.publish call requires a valid envelope.");a.channel=a.channel||e,a.timeStamp=new Date,p.configuration.bus.publish(a)},2:function(a,b){p.configuration.bus.publish({channel:e,topic:a,timeStamp:new Date,data:b})},3:function(a,b,c){p.configuration.bus.publish({channel:a,topic:b,timeStamp:new Date,data:c})}};n.subscriptions[h]={};var p={configuration:{bus:n,resolver:m},channel:function(){var a=arguments.length,b=arguments[0],c=arguments[1];return a===1&&(Object.prototype.toString.call(b)==="[object String]"?(b=e,c=arguments[0]):(b=arguments[0].channel||e,c=arguments[0].topic)),new k(b,c)},subscribe:function(a){var b=a.callback,c=a.topic,d=a.channel||e;return new l(d,c,b)},publish:function(){var a=arguments.length;o[a]&&o[a].apply(this,arguments)},addWireTap:function(a){return this.configuration.bus.addWireTap(a)},linkChannels:function(b,c){var d=[];return a.isArray(b)||(b=[b]),a.isArray(c)||(c=[c]),a.each(b,function(b){var f=b.topic||"*";a.each(c,function(c){var f=c.channel||e;d.push(p.subscribe({channel:b.channel||e,topic:b.topic||"*",callback:function(b,d){var e=d;e.topic=a.isFunction(c.topic)?c.topic(d.topic):c.topic||d.topic,e.channel=f,e.data=b,p.publish(e)}}))})}),d}};return b.postal=p,p})
\ No newline at end of file
diff --git a/spec/BindingsResolver.spec.js b/spec/BindingsResolver.spec.js
index 57ea824..4ab71de 100644
--- a/spec/BindingsResolver.spec.js
+++ b/spec/BindingsResolver.spec.js
@@ -1,90 +1,46 @@
 QUnit.specify("postal.js", function(){
-    describe("bindingsResolver", function(){
-        /*describe("When calling regexify", function() {
-            describe("With a topic containing no special escape chars", function() {
-                var result = bindingsResolver.regexify("CoolTopic");
-                it("Should equal 'CoolTopic'", function(){
-                    assert(result).equals("CoolTopic");
-                });
-            });
-            describe("With a topic containing periods", function() {
-                var result = bindingsResolver.regexify("Top.Middle.Bottom");
-                it("Only the periods should be escaped", function(){
-                    assert(result).equals("Top\\.Middle\\.Bottom");
-                });
-            });
-            describe("With a topic containing a hash", function() {
-                var result = bindingsResolver.regexify("Top#Bottom");
-                it("Only the hash should be escaped", function(){
-                    assert(result).equals("Top[A-Z,a-z,0-9]*Bottom");
-                });
-            });
-            describe("With a topic containing a hash and periods", function() {
-                var result = bindingsResolver.regexify("Top.#.Bottom");
-                it("The hash should be escaped for alphanumeric regex", function(){
-                    assert(result).equals("Top\\.[A-Z,a-z,0-9]*\\.Bottom");
-                });
-            });
-            describe("With a topic containing a hash and asterisk", function() {
-                var result = bindingsResolver.regexify("Top#Bottom*");
-                it("The hash should be escaped for alphanumeric regex", function(){
-                    assert(result).equals("Top[A-Z,a-z,0-9]*Bottom.*");
-                });
-            });
-            describe("With a topic containing a hash, asterisk and periods", function() {
-                var result = bindingsResolver.regexify("Top.#.Bottom.*");
-                it("The hash should be escaped for alphanumeric regex", function(){
-                    assert(result).equals("Top\\.[A-Z,a-z,0-9]*\\.Bottom\\..*");
-                });
-            });
-            describe("With a topic containing an asterisk and periods", function() {
-                var result = bindingsResolver.regexify("Top.*.Bottom");
-                it("The asterisk should be escaped", function(){
-                    assert(result).equals("Top\\..*\\.Bottom");
-                });
-            });
-        });*/
-        describe("When calling compare", function(){
-            describe("With topic Top.Middle.Bottom and binding Top.Middle.Bottom", function(){
-                var result = bindingsResolver.compare("Top.Middle.Bottom", "Top.Middle.Bottom"),
-                    cached = bindingsResolver.cache["Top.Middle.Bottom"]["Top.Middle.Bottom"];
-                it("Result should be true", function() {
-                    assert(result).isTrue();
-                });
-                it("Should create a resolver cache entry", function(){
-                    assert(cached).isTrue();
-                });
-            });
-            describe("With topic Top.Middle.Bottom and binding Top.#.Bottom", function(){
-                var result = bindingsResolver.compare("Top.#.Bottom", "Top.Middle.Bottom"),
-                    cached = bindingsResolver.cache["Top.Middle.Bottom"]["Top.#.Bottom"];
-                it("Result should be true", function() {
-                    assert(result).isTrue();
-                });
-                it("Should create a resolver cache entry", function(){
-                    assert(cached).isTrue();
-                });
-            });
-            describe("With topic Top.Middle.Bottom and binding Top.*.Bottom", function(){
-                var result = bindingsResolver.compare("Top.*.Bottom", "Top.Middle.Bottom"),
-                    cached = bindingsResolver.cache["Top.Middle.Bottom"]["Top.*.Bottom"];
-                it("Result should be true", function() {
-                    assert(result).isTrue();
-                });
-                it("Should create a resolver cache entry", function(){
-                    assert(cached).isTrue();
-                });
-            });
-            describe("With topic Top.Middle.Bottom and binding #.*.Bottom", function(){
-                var result = bindingsResolver.compare("#.*.Bottom", "Top.Middle.Bottom"),
-                    cached = bindingsResolver.cache["Top.Middle.Bottom"]["#.*.Bottom"];
-                it("Result should be true", function() {
-                    assert(result).isTrue();
-                });
-                it("Should create a resolver cache entry", function(){
-                    assert(cached).isTrue();
-                });
-            });
-        });
-    });
+	describe("bindingsResolver", function(){
+		describe("When calling compare", function(){
+			describe("With topic Top.Middle.Bottom and binding Top.Middle.Bottom", function(){
+				var result = bindingsResolver.compare("Top.Middle.Bottom", "Top.Middle.Bottom"),
+					cached = bindingsResolver.cache["Top.Middle.Bottom"]["Top.Middle.Bottom"];
+				it("Result should be true", function() {
+					assert(result).isTrue();
+				});
+				it("Should create a resolver cache entry", function(){
+					assert(cached).isTrue();
+				});
+			});
+			describe("With topic Top.Middle.Bottom and binding Top.#.Bottom", function(){
+				var result = bindingsResolver.compare("Top.#.Bottom", "Top.Middle.Bottom"),
+					cached = bindingsResolver.cache["Top.Middle.Bottom"]["Top.#.Bottom"];
+				it("Result should be true", function() {
+					assert(result).isTrue();
+				});
+				it("Should create a resolver cache entry", function(){
+					assert(cached).isTrue();
+				});
+			});
+			describe("With topic Top.Middle.Bottom and binding Top.*.Bottom", function(){
+				var result = bindingsResolver.compare("Top.*.Bottom", "Top.Middle.Bottom"),
+					cached = bindingsResolver.cache["Top.Middle.Bottom"]["Top.*.Bottom"];
+				it("Result should be true", function() {
+					assert(result).isTrue();
+				});
+				it("Should create a resolver cache entry", function(){
+					assert(cached).isTrue();
+				});
+			});
+			describe("With topic Top.Middle.Bottom and binding #.*.Bottom", function(){
+				var result = bindingsResolver.compare("#.*.Bottom", "Top.Middle.Bottom"),
+					cached = bindingsResolver.cache["Top.Middle.Bottom"]["#.*.Bottom"];
+				it("Result should be true", function() {
+					assert(result).isTrue();
+				});
+				it("Should create a resolver cache entry", function(){
+					assert(cached).isTrue();
+				});
+			});
+		});
+	});
 });
\ No newline at end of file
diff --git a/spec/ChannelDefinition.spec.js b/spec/ChannelDefinition.spec.js
index 5c13924..15378ab 100644
--- a/spec/ChannelDefinition.spec.js
+++ b/spec/ChannelDefinition.spec.js
@@ -1,20 +1,20 @@
 QUnit.specify("postal.js", function(){
-    describe("ChannelDefinition", function(){
-        describe("When initializing a channel definition", function() {
-            var chDef = new ChannelDefinition("TestChannel", "TestTopic");
-            it("should set channel to TestChannel", function(){
-                assert(chDef.channel).equals("TestChannel");
-            });
-            it("should set topic to TestTopic", function(){
-                assert(chDef._topic).equals("TestTopic");
-            });
-        });
-        describe("When calling subscribe", function() {
-            var ch = new ChannelDefinition("TestChannel", "TestTopic"),
-                sub = ch.subscribe(function(){ });
-            it("subscription should be instance of SubscriptionDefinition", function(){
-                assert(sub instanceof SubscriptionDefinition).isTrue();
-            });
-        });
-    });
+	describe("ChannelDefinition", function(){
+		describe("When initializing a channel definition", function() {
+			var chDef = new ChannelDefinition("TestChannel", "TestTopic");
+			it("should set channel to TestChannel", function(){
+				assert(chDef.channel).equals("TestChannel");
+			});
+			it("should set topic to TestTopic", function(){
+				assert(chDef._topic).equals("TestTopic");
+			});
+		});
+		describe("When calling subscribe", function() {
+			var ch = new ChannelDefinition("TestChannel", "TestTopic"),
+				sub = ch.subscribe(function(){ });
+			it("subscription should be instance of SubscriptionDefinition", function(){
+				assert(sub instanceof SubscriptionDefinition).isTrue();
+			});
+		});
+	});
 });
\ No newline at end of file
diff --git a/spec/DistinctPredicate.spec.js b/spec/DistinctPredicate.spec.js
index c9321d3..7a92d47 100644
--- a/spec/DistinctPredicate.spec.js
+++ b/spec/DistinctPredicate.spec.js
@@ -1,76 +1,76 @@
 QUnit.specify("postal.js", function(){
-    describe("DistinctPredicate", function(){
-        describe("When calling the function with the same data multiple times", function() {
-            var pred = new DistinctPredicate(),
-                data = { name: "Dr Who" },
-                results = [];
-            results.push(pred(data));
-            results.push(pred(data));
-            results.push(pred(data));
+	describe("DistinctPredicate", function(){
+		describe("When calling the function with the same data multiple times", function() {
+			var pred = new DistinctPredicate(),
+				data = { name: "Dr Who" },
+				results = [];
+			results.push(pred(data));
+			results.push(pred(data));
+			results.push(pred(data));
 
-            it("The first result should be true", function(){
-                assert(results[0]).isTrue();
-            });
-            it("The second result should be false", function(){
-                assert(results[1]).isFalse();
-            });
-            it("The third result should be false", function(){
-                assert(results[2]).isFalse();
-            });
-        });
-        describe("When calling the function with different data every time", function() {
-            var predA = new DistinctPredicate(),
-                data = { name: "Amelia" },
-                res = [];
-            res.push(predA(data));
-            data.name = "Rose";
-            res.push(predA(data));
-            data.name = "Martha";
-            res.push(predA(data));
+			it("The first result should be true", function(){
+				assert(results[0]).isTrue();
+			});
+			it("The second result should be false", function(){
+				assert(results[1]).isFalse();
+			});
+			it("The third result should be false", function(){
+				assert(results[2]).isFalse();
+			});
+		});
+		describe("When calling the function with different data every time", function() {
+			var predA = new DistinctPredicate(),
+				data = { name: "Amelia" },
+				res = [];
+			res.push(predA(data));
+			data.name = "Rose";
+			res.push(predA(data));
+			data.name = "Martha";
+			res.push(predA(data));
 
-            it("The first result should be true", function(){
-                assert(res[0]).isTrue();
-            });
-            it("The second result should be true", function(){
-                assert(res[1]).isTrue();
-            });
-            it("The third result should be true", function(){
-                assert(res[2]).isTrue();
-            });
-        });
-        describe("When calling the function with different data every two calls", function() {
-            var predA = new DistinctPredicate(),
-                data = { name: "Amelia" },
-                res = [];
-            res.push(predA(data));
-            res.push(predA(data));
-            data.name = "Rose";
-            res.push(predA(data));
-            res.push(predA(data));
-            data.name = "Martha";
-            res.push(predA(data));
-            res.push(predA(data));
+			it("The first result should be true", function(){
+				assert(res[0]).isTrue();
+			});
+			it("The second result should be true", function(){
+				assert(res[1]).isTrue();
+			});
+			it("The third result should be true", function(){
+				assert(res[2]).isTrue();
+			});
+		});
+		describe("When calling the function with different data every two calls", function() {
+			var predA = new DistinctPredicate(),
+				data = { name: "Amelia" },
+				res = [];
+			res.push(predA(data));
+			res.push(predA(data));
+			data.name = "Rose";
+			res.push(predA(data));
+			res.push(predA(data));
+			data.name = "Martha";
+			res.push(predA(data));
+			res.push(predA(data));
 
-            it("The first result should be true", function(){
-                assert(res[0]).isTrue();
-            });
-            it("The second result should be false", function(){
-                assert(res[1]).isFalse();
-            });
+			it("The first result should be true", function(){
+				assert(res[0]).isTrue();
+			});
+			it("The second result should be false", function(){
+				assert(res[1]).isFalse();
+			});
 
-            it("The third result should be isTrue", function(){
-                assert(res[2]).isTrue();
-            });
-            it("The fourth result should be false", function(){
-                assert(res[3]).isFalse();
-            });
+			it("The third result should be isTrue", function(){
+				assert(res[2]).isTrue();
+			});
+			it("The fourth result should be false", function(){
+				assert(res[3]).isFalse();
+			});
 
-            it("The fifth result should be true", function(){
-                assert(res[4]).isTrue();
-            });
-            it("The sixth result should be false", function(){
-                assert(res[5]).isFalse();
-            });
-        });
-    });
+			it("The fifth result should be true", function(){
+				assert(res[4]).isTrue();
+			});
+			it("The sixth result should be false", function(){
+				assert(res[5]).isFalse();
+			});
+		});
+	});
 });
\ No newline at end of file
diff --git a/spec/Postal.spec.js b/spec/Postal.spec.js
index 8633320..1dc7d92 100644
--- a/spec/Postal.spec.js
+++ b/spec/Postal.spec.js
@@ -1,543 +1,543 @@
 QUnit.specify("postal.js", function(){
-    describe("Postal", function(){
-        var subscription,
-            sub,
-            channel,
-            caughtSubscribeEvent = false,
-            caughtUnsubscribeEvent = false;
+	describe("Postal", function(){
+		var subscription,
+			sub,
+			channel,
+			caughtSubscribeEvent = false,
+			caughtUnsubscribeEvent = false;
 
-        describe("when creating basic subscription", function() {
-            var systemSubscription = {};
-            before(function(){
-                systemSubscription = postal.subscribe({
-	                channel: "postal",
-	                topic: "subscription.created",
-	                callback: function(data, envelope){
-	                    console.log("on subscription " + JSON.stringify(data));
-	                    if( data.event &&
-	                        data.event == "subscription.created" &&
-	                        data.channel == "MyChannel" &&
-	                        data.topic == "MyTopic") {
-	                        caughtSubscribeEvent = true;
-	                    }
-	                }
-                });
-                subscription = postal.channel({ channel: "MyChannel", topic: "MyTopic" })
-                                     .subscribe(function() { });
-                sub = postal.configuration.bus.subscriptions.MyChannel.MyTopic[0];
-            });
-            after(function(){
-                systemSubscription.unsubscribe();
-                postal.configuration.bus.subscriptions = {};
-            });
-            it("should create an channel called MyChannel", function(){
-                assert(postal.configuration.bus.subscriptions["MyChannel"] !== undefined).isTrue();
-            });
-            it("should create a topic under MyChannel called MyTopic", function(){
-                assert(postal.configuration.bus.subscriptions["MyChannel"]["MyTopic"] !== undefined).isTrue();
-            });
-            it("should have set subscription channel value", function() {
-                assert(sub.channel).equals("MyChannel");
-            });
-	        it("should have set subscription topic value", function() {
-                assert(sub.topic).equals("MyTopic");
-            });
-	        it("should have set subscription priority value", function() {
-                assert(sub.priority).equals(50);
-            });
-	        it("should have defaulted the subscription constraints array", function() {
-                assert(sub.constraints.length).equals(0);
-            });
-	        it("should have defaulted the subscription disposeAfter value", function() {
-                assert(sub.maxCalls).equals(0);
-            });
-	        it("should have defaulted the subscription context value", function() {
-                assert(sub.context).isNull();
-            });
-            it("should have captured subscription creation event", function() {
-                assert(caughtSubscribeEvent).isTrue();
-            });
-        });
-        describe("when unsubscribing", function() {
-            var subExistsBefore = false,
-                subExistsAfter = true;
-            var systemSubscription = {};
-            before(function(){
-                systemSubscription = postal.subscribe({
-	                channel: "postal",
-	                topic: "subscription.*",
-	                callback: function(data, env){
-	                    if( data.event &&
-	                        data.event == "subscription.removed" &&
-	                        data.channel == "MyChannel" &&
-	                        data.topic == "MyTopic") {
-	                        caughtUnsubscribeEvent = true;
-	                    };
-	                }
-                });
-                subscription = postal.channel({ channel: "MyChannel", topic: "MyTopic" })
-                                     .subscribe(function() { });
-                subExistsBefore = postal.configuration.bus.subscriptions.MyChannel.MyTopic[0] !== undefined;
-                subscription.unsubscribe();
-                subExistsAfter = postal.configuration.bus.subscriptions.MyChannel.MyTopic.length !== 0;
-            });
-            after(function(){
-                systemSubscription.unsubscribe();
-                postal.configuration.bus.subscriptions = {};
-            });
-            it("subscription should exist before unsubscribe", function(){
-                assert(subExistsBefore).isTrue();
-            });
-            it("subscription should not exist after unsubscribe", function(){
-                assert(subExistsAfter).isFalse();
-            });
-            it("should have captured unsubscription creation event", function() {
-                assert(caughtUnsubscribeEvent).isTrue();
-            });
-        });
-	    describe("When publishing a message", function(){
-            var msgReceivedCnt = 0,
-                msgData;
-            before(function(){
-                channel = postal.channel({ channel: "MyChannel", topic: "MyTopic" });
-                subscription = channel.subscribe(function(data) { msgReceivedCnt++; msgData = data;});
-                channel.publish("Testing123");
-                subscription.unsubscribe();
-                channel.publish("Testing123");
-            });
-            after(function(){
-                postal.configuration.bus.subscriptions = {};
-            });
-            it("subscription callback should be invoked once", function(){
-                assert(msgReceivedCnt).equals(1);
-            });
-            it("subscription callback should receive published data", function(){
-                assert(msgData).equals("Testing123");
-            });
-        });
-        describe("When subscribing with a disposeAfter of 5", function(){
-            var msgReceivedCnt = 0;
-            before(function(){
-                channel = postal.channel({ channel: "MyChannel", topic: "MyTopic" });
-                subscription = channel.subscribe(function(data) { msgReceivedCnt++; })
-                                      .disposeAfter(5);
-                channel.publish("Testing123");
-                channel.publish("Testing123");
-                channel.publish("Testing123");
-                channel.publish("Testing123");
-                channel.publish("Testing123");
-                channel.publish("Testing123");
-            });
-            after(function(){
-                postal.configuration.bus.subscriptions = {};
-            });
-            it("subscription callback should be invoked 5 times", function(){
-                assert(msgReceivedCnt).equals(5);
-            });
-        });
-	    describe("When subscribing and ignoring duplicates", function(){
-            var subInvokedCnt = 0;
-            before(function(){
-                channel = postal.channel({ channel: "MyChannel", topic: "MyTopic" });
-                subscription = channel.subscribe(function(data) { subInvokedCnt++; })
-                                      .ignoreDuplicates();
-                channel.publish("Testing123");
-                channel.publish("Testing123");
-                channel.publish("Testing123");
-                channel.publish("Testing123");
-                channel.publish("Testing123");
-                channel.publish("Testing123");
-            });
-            after(function(){
-                postal.configuration.bus.subscriptions = {};
-                subInvokedCnt = 0;
-            });
-            it("should have a constraint on the subscription", function() {
-                assert(postal.configuration.bus.subscriptions.MyChannel.MyTopic[0].constraints.length).equals(1);
-            });
-            it("subscription callback should be invoked once", function(){
-                assert(subInvokedCnt).equals(1);
-            });
-        });
-        describe("When subscribing and passing onHandled callback", function(){
-            var whte = false;
-            before(function(){
-                channel = postal.channel({ channel: "MyChannel", topic: "MyTopic" });
-                subscription = channel.subscribe(function(data) {  })
-                                      .whenHandledThenExecute(function() { whte = true; });
-                channel.publish("Testing123");
-            });
-            after(function(){
-                postal.configuration.bus.subscriptions = {};
-                whte = false;
-            });
-            it("should have an onHandled callback on the subscription", function() {
-                assert(typeof postal.configuration.bus.subscriptions.MyChannel.MyTopic[0].onHandled).equals("function");
-            });
-            it("should have invoked the onHandled callback", function() {
-                assert(whte).isTrue();
-            });
-        });
-	    describe("When subscribing with one constraint returning true", function(){
-            var recvd = false;
-            before(function(){
-                channel = postal.channel({ channel: "MyChannel", topic: "MyTopic" });
-                subscription = channel.subscribe(function(data) { recvd= true; })
-                                      .withConstraint(function() { return true; });
-                channel.publish("Testing123");
-            });
-            after(function(){
-                postal.configuration.bus.subscriptions = {};
-                recvd = false;
-            });
-            it("should have a constraint on the subscription", function() {
-                assert(postal.configuration.bus.subscriptions.MyChannel.MyTopic[0].constraints.length).equals(1);
-            });
-            it("should have invoked the subscription callback", function() {
-                assert(recvd).isTrue();
-            });
-        });
-        describe("When subscribing with one constraint returning false", function(){
-            var recvd = false;
-            before(function(){
-                channel = postal.channel({ channel: "MyChannel", topic: "MyTopic" });
-                subscription = channel.subscribe(function(data) { recvd= true; })
-                                      .withConstraint(function() { return false; });
-                channel.publish("Testing123");
-            });
-            after(function(){
-                postal.configuration.bus.subscriptions = {};
-                recvd = false;
-            });
-            it("should have a constraint on the subscription", function() {
-                assert(postal.configuration.bus.subscriptions.MyChannel.MyTopic[0].constraints.length).equals(1);
-            });
-            it("should not have invoked the subscription callback", function() {
-                assert(recvd).isFalse();
-            });
-        });
-        describe("When subscribing with multiple constraints returning true", function(){
-            var recvd = false;
-            before(function(){
-                channel = postal.channel({ channel: "MyChannel", topic: "MyTopic" });
-                subscription = channel.subscribe(function(data) { recvd= true; })
-                                      .withConstraints([function() { return true; },
-                                                       function() { return true; },
-                                                       function() { return true; }]);
-                channel.publish("Testing123");
-            });
-            after(function(){
-                postal.configuration.bus.subscriptions = {};
-                recvd = false;
-            });
-            it("should have a constraint on the subscription", function() {
-                assert(postal.configuration.bus.subscriptions.MyChannel.MyTopic[0].constraints.length).equals(3);
-            });
-            it("should have invoked the onHandled callback", function() {
-                assert(recvd).isTrue();
-            });
-        });
-        describe("When subscribing with multiple constraints and one returning false", function(){
-            var recvd = false;
-            before(function(){
-                channel = postal.channel({ channel: "MyChannel", topic: "MyTopic" });
-                subscription = channel.subscribe(function(data) { recvd= true; })
-                                      .withConstraints([function() { return true; },
-                                                       function() { return false; },
-                                                       function() { return true; }]);
-                channel.publish("Testing123");
-            });
-            after(function(){
-                postal.configuration.bus.subscriptions = {};
-                recvd = false;
-            });
-            it("should have a constraint on the subscription", function() {
-                assert(postal.configuration.bus.subscriptions.MyChannel.MyTopic[0].constraints.length).equals(3);
-            });
-            it("should not have invoked the onHandled callback", function() {
-                assert(recvd).isFalse();
-            });
-        });
-        describe("When subscribing with the context being set", function(){
-            var count = 0,
-                obj = {
-                    increment: function() {
-                        count++;
-                    }
-                };
-            before(function(){
-                channel = postal.channel({ channel: "MyChannel", topic: "MyTopic" });
-                subscription = channel.subscribe(function(data) { this.increment(); })
-                                      .withContext(obj);
-                channel.publish("Testing123");
-            });
-            after(function(){
-                postal.configuration.bus.subscriptions = {};
-            });
-            it("should have called obj.increment", function() {
-                assert(count).equals(1);
-            });
-        });
-        describe("When subscribing with a hierarchical binding, no wildcards", function(){
-            var count = 0, channelB, channelC;
-            before(function(){
-                channel = postal.channel({ channel: "MyChannel", topic: "MyTopic.MiddleTopic.SubTopic" });
-                channelB = postal.channel({ channel: "MyChannel", topic: "MyTopic.MiddleTopic" });
-                channelC = postal.channel({ channel: "MyChannel", topic: "MyTopic.MiddleTopic.SubTopic.YetAnother" });
-                subscription = channel.subscribe(function(data) { count++; });
-                channel.publish("Testing123");
-                channelB.publish("Testing123");
-                channelC.publish("Testing123");
-            });
-            after(function(){
-                postal.configuration.bus.subscriptions = {};
-                count = 0;
-            });
-            it("should have invoked subscription callback only once", function() {
-                assert(count).equals(1);
-            });
-        });
-        describe("When subscribing with a hierarchical binding, using #", function(){
-            var count = 0, channelB, channelC, channelD;
-            before(function(){
-                channel = postal.channel({ channel: "MyChannel", topic: "MyTopic.#.SubTopic" });
-                channelB = postal.channel({ channel: "MyChannel", topic: "MyTopic.MiddleTopic" });
-                channelC = postal.channel({ channel: "MyChannel", topic: "MyTopic.MiddleTopic.SubTopic" });
-                channelD = postal.channel({ channel: "MyChannel", topic: "MyTopic.MiddleTopic.SubTopic.YetAnother" });
-                subscription = channel.subscribe(function(data) { count++; });
-                channelC.publish({channel: "MyChannel", topic: "MyTopic.MiddleTopic.SubTopic", data: "Testing123"});
-                channelB.publish({channel: "MyChannel", topic: "MyTopic.MiddleTopic", data: "Testing123"});
-                channelD.publish({channel: "MyChannel", topic: "MyTopic.MiddleTopic.SubTopic.YetAnother", data: "Testing123"});
-            });
-            after(function(){
-                postal.configuration.bus.subscriptions = {};
-                count = 0;
-            });
-            it("should have invoked subscription callback only once", function() {
-                assert(count).equals(1);
-            });
-        });
-        describe("When subscribing with a hierarchical binding, using *", function(){
-            var count = 0, channelB, channelC, channelD;
-            before(function(){
-                channel = postal.channel({ channel: "MyChannel", topic: "MyTopic.MiddleTopic.*" });
-                channelB = postal.channel({ channel: "MyChannel", topic: "MyTopic.MiddleTopic" });
-                channelC = postal.channel({ channel: "MyChannel", topic: "MyTopic.MiddleTopic.SubTopic" });
-                channelD = postal.channel({ channel: "MyChannel", topic: "MyTopic.MiddleTopic.SubTopic.YetAnother" });
-                subscription = channel.subscribe(function(data) { count++; });
+		describe("when creating basic subscription", function() {
+			var systemSubscription = {};
+			before(function(){
+				systemSubscription = postal.subscribe({
+					channel: "postal",
+					topic: "subscription.created",
+					callback: function(data, envelope){
+						console.log("on subscription " + JSON.stringify(data));
+						if( data.event &&
+							data.event == "subscription.created" &&
+							data.channel == "MyChannel" &&
+							data.topic == "MyTopic") {
+							caughtSubscribeEvent = true;
+						}
+					}
+				});
+				subscription = postal.channel({ channel: "MyChannel", topic: "MyTopic" })
+					.subscribe(function() { });
+				sub = postal.configuration.bus.subscriptions.MyChannel.MyTopic[0];
+			});
+			after(function(){
+				systemSubscription.unsubscribe();
+				postal.configuration.bus.subscriptions = {};
+			});
+			it("should create an channel called MyChannel", function(){
+				assert(postal.configuration.bus.subscriptions["MyChannel"] !== undefined).isTrue();
+			});
+			it("should create a topic under MyChannel called MyTopic", function(){
+				assert(postal.configuration.bus.subscriptions["MyChannel"]["MyTopic"] !== undefined).isTrue();
+			});
+			it("should have set subscription channel value", function() {
+				assert(sub.channel).equals("MyChannel");
+			});
+			it("should have set subscription topic value", function() {
+				assert(sub.topic).equals("MyTopic");
+			});
+			it("should have set subscription priority value", function() {
+				assert(sub.priority).equals(50);
+			});
+			it("should have defaulted the subscription constraints array", function() {
+				assert(sub.constraints.length).equals(0);
+			});
+			it("should have defaulted the subscription disposeAfter value", function() {
+				assert(sub.maxCalls).equals(0);
+			});
+			it("should have defaulted the subscription context value", function() {
+				assert(sub.context).isNull();
+			});
+			it("should have captured subscription creation event", function() {
+				assert(caughtSubscribeEvent).isTrue();
+			});
+		});
+		describe("when unsubscribing", function() {
+			var subExistsBefore = false,
+				subExistsAfter = true;
+			var systemSubscription = {};
+			before(function(){
+				systemSubscription = postal.subscribe({
+					channel: "postal",
+					topic: "subscription.*",
+					callback: function(data, env){
+						if( data.event &&
+							data.event == "subscription.removed" &&
+							data.channel == "MyChannel" &&
+							data.topic == "MyTopic") {
+							caughtUnsubscribeEvent = true;
+						};
+					}
+				});
+				subscription = postal.channel({ channel: "MyChannel", topic: "MyTopic" })
+					.subscribe(function() { });
+				subExistsBefore = postal.configuration.bus.subscriptions.MyChannel.MyTopic[0] !== undefined;
+				subscription.unsubscribe();
+				subExistsAfter = postal.configuration.bus.subscriptions.MyChannel.MyTopic.length !== 0;
+			});
+			after(function(){
+				systemSubscription.unsubscribe();
+				postal.configuration.bus.subscriptions = {};
+			});
+			it("subscription should exist before unsubscribe", function(){
+				assert(subExistsBefore).isTrue();
+			});
+			it("subscription should not exist after unsubscribe", function(){
+				assert(subExistsAfter).isFalse();
+			});
+			it("should have captured unsubscription creation event", function() {
+				assert(caughtUnsubscribeEvent).isTrue();
+			});
+		});
+		describe("When publishing a message", function(){
+			var msgReceivedCnt = 0,
+				msgData;
+			before(function(){
+				channel = postal.channel({ channel: "MyChannel", topic: "MyTopic" });
+				subscription = channel.subscribe(function(data) { msgReceivedCnt++; msgData = data;});
+				channel.publish("Testing123");
+				subscription.unsubscribe();
+				channel.publish("Testing123");
+			});
+			after(function(){
+				postal.configuration.bus.subscriptions = {};
+			});
+			it("subscription callback should be invoked once", function(){
+				assert(msgReceivedCnt).equals(1);
+			});
+			it("subscription callback should receive published data", function(){
+				assert(msgData).equals("Testing123");
+			});
+		});
+		describe("When subscribing with a disposeAfter of 5", function(){
+			var msgReceivedCnt = 0;
+			before(function(){
+				channel = postal.channel({ channel: "MyChannel", topic: "MyTopic" });
+				subscription = channel.subscribe(function(data) { msgReceivedCnt++; })
+					.disposeAfter(5);
+				channel.publish("Testing123");
+				channel.publish("Testing123");
+				channel.publish("Testing123");
+				channel.publish("Testing123");
+				channel.publish("Testing123");
+				channel.publish("Testing123");
+			});
+			after(function(){
+				postal.configuration.bus.subscriptions = {};
+			});
+			it("subscription callback should be invoked 5 times", function(){
+				assert(msgReceivedCnt).equals(5);
+			});
+		});
+		describe("When subscribing and ignoring duplicates", function(){
+			var subInvokedCnt = 0;
+			before(function(){
+				channel = postal.channel({ channel: "MyChannel", topic: "MyTopic" });
+				subscription = channel.subscribe(function(data) { subInvokedCnt++; })
+					.ignoreDuplicates();
+				channel.publish("Testing123");
+				channel.publish("Testing123");
+				channel.publish("Testing123");
+				channel.publish("Testing123");
+				channel.publish("Testing123");
+				channel.publish("Testing123");
+			});
+			after(function(){
+				postal.configuration.bus.subscriptions = {};
+				subInvokedCnt = 0;
+			});
+			it("should have a constraint on the subscription", function() {
+				assert(postal.configuration.bus.subscriptions.MyChannel.MyTopic[0].constraints.length).equals(1);
+			});
+			it("subscription callback should be invoked once", function(){
+				assert(subInvokedCnt).equals(1);
+			});
+		});
+		describe("When subscribing and passing onHandled callback", function(){
+			var whte = false;
+			before(function(){
+				channel = postal.channel({ channel: "MyChannel", topic: "MyTopic" });
+				subscription = channel.subscribe(function(data) {  })
+					.whenHandledThenExecute(function() { whte = true; });
+				channel.publish("Testing123");
+			});
+			after(function(){
+				postal.configuration.bus.subscriptions = {};
+				whte = false;
+			});
+			it("should have an onHandled callback on the subscription", function() {
+				assert(typeof postal.configuration.bus.subscriptions.MyChannel.MyTopic[0].onHandled).equals("function");
+			});
+			it("should have invoked the onHandled callback", function() {
+				assert(whte).isTrue();
+			});
+		});
+		describe("When subscribing with one constraint returning true", function(){
+			var recvd = false;
+			before(function(){
+				channel = postal.channel({ channel: "MyChannel", topic: "MyTopic" });
+				subscription = channel.subscribe(function(data) { recvd= true; })
+					.withConstraint(function() { return true; });
+				channel.publish("Testing123");
+			});
+			after(function(){
+				postal.configuration.bus.subscriptions = {};
+				recvd = false;
+			});
+			it("should have a constraint on the subscription", function() {
+				assert(postal.configuration.bus.subscriptions.MyChannel.MyTopic[0].constraints.length).equals(1);
+			});
+			it("should have invoked the subscription callback", function() {
+				assert(recvd).isTrue();
+			});
+		});
+		describe("When subscribing with one constraint returning false", function(){
+			var recvd = false;
+			before(function(){
+				channel = postal.channel({ channel: "MyChannel", topic: "MyTopic" });
+				subscription = channel.subscribe(function(data) { recvd= true; })
+					.withConstraint(function() { return false; });
+				channel.publish("Testing123");
+			});
+			after(function(){
+				postal.configuration.bus.subscriptions = {};
+				recvd = false;
+			});
+			it("should have a constraint on the subscription", function() {
+				assert(postal.configuration.bus.subscriptions.MyChannel.MyTopic[0].constraints.length).equals(1);
+			});
+			it("should not have invoked the subscription callback", function() {
+				assert(recvd).isFalse();
+			});
+		});
+		describe("When subscribing with multiple constraints returning true", function(){
+			var recvd = false;
+			before(function(){
+				channel = postal.channel({ channel: "MyChannel", topic: "MyTopic" });
+				subscription = channel.subscribe(function(data) { recvd= true; })
+					.withConstraints([function() { return true; },
+					function() { return true; },
+					function() { return true; }]);
+				channel.publish("Testing123");
+			});
+			after(function(){
+				postal.configuration.bus.subscriptions = {};
+				recvd = false;
+			});
+			it("should have a constraint on the subscription", function() {
+				assert(postal.configuration.bus.subscriptions.MyChannel.MyTopic[0].constraints.length).equals(3);
+			});
+			it("should have invoked the onHandled callback", function() {
+				assert(recvd).isTrue();
+			});
+		});
+		describe("When subscribing with multiple constraints and one returning false", function(){
+			var recvd = false;
+			before(function(){
+				channel = postal.channel({ channel: "MyChannel", topic: "MyTopic" });
+				subscription = channel.subscribe(function(data) { recvd= true; })
+					.withConstraints([function() { return true; },
+					function() { return false; },
+					function() { return true; }]);
+				channel.publish("Testing123");
+			});
+			after(function(){
+				postal.configuration.bus.subscriptions = {};
+				recvd = false;
+			});
+			it("should have a constraint on the subscription", function() {
+				assert(postal.configuration.bus.subscriptions.MyChannel.MyTopic[0].constraints.length).equals(3);
+			});
+			it("should not have invoked the onHandled callback", function() {
+				assert(recvd).isFalse();
+			});
+		});
+		describe("When subscribing with the context being set", function(){
+			var count = 0,
+				obj = {
+					increment: function() {
+						count++;
+					}
+				};
+			before(function(){
+				channel = postal.channel({ channel: "MyChannel", topic: "MyTopic" });
+				subscription = channel.subscribe(function(data) { this.increment(); })
+					.withContext(obj);
+				channel.publish("Testing123");
+			});
+			after(function(){
+				postal.configuration.bus.subscriptions = {};
+			});
+			it("should have called obj.increment", function() {
+				assert(count).equals(1);
+			});
+		});
+		describe("When subscribing with a hierarchical binding, no wildcards", function(){
+			var count = 0, channelB, channelC;
+			before(function(){
+				channel = postal.channel({ channel: "MyChannel", topic: "MyTopic.MiddleTopic.SubTopic" });
+				channelB = postal.channel({ channel: "MyChannel", topic: "MyTopic.MiddleTopic" });
+				channelC = postal.channel({ channel: "MyChannel", topic: "MyTopic.MiddleTopic.SubTopic.YetAnother" });
+				subscription = channel.subscribe(function(data) { count++; });
+				channel.publish("Testing123");
+				channelB.publish("Testing123");
+				channelC.publish("Testing123");
+			});
+			after(function(){
+				postal.configuration.bus.subscriptions = {};
+				count = 0;
+			});
+			it("should have invoked subscription callback only once", function() {
+				assert(count).equals(1);
+			});
+		});
+		describe("When subscribing with a hierarchical binding, using #", function(){
+			var count = 0, channelB, channelC, channelD;
+			before(function(){
+				channel = postal.channel({ channel: "MyChannel", topic: "MyTopic.#.SubTopic" });
+				channelB = postal.channel({ channel: "MyChannel", topic: "MyTopic.MiddleTopic" });
+				channelC = postal.channel({ channel: "MyChannel", topic: "MyTopic.MiddleTopic.SubTopic" });
+				channelD = postal.channel({ channel: "MyChannel", topic: "MyTopic.MiddleTopic.SubTopic.YetAnother" });
+				subscription = channel.subscribe(function(data) { count++; });
+				channelC.publish({channel: "MyChannel", topic: "MyTopic.MiddleTopic.SubTopic", data: "Testing123"});
+				channelB.publish({channel: "MyChannel", topic: "MyTopic.MiddleTopic", data: "Testing123"});
+				channelD.publish({channel: "MyChannel", topic: "MyTopic.MiddleTopic.SubTopic.YetAnother", data: "Testing123"});
+			});
+			after(function(){
+				postal.configuration.bus.subscriptions = {};
+				count = 0;
+			});
+			it("should have invoked subscription callback only once", function() {
+				assert(count).equals(1);
+			});
+		});
+		describe("When subscribing with a hierarchical binding, using *", function(){
+			var count = 0, channelB, channelC, channelD;
+			before(function(){
+				channel = postal.channel({ channel: "MyChannel", topic: "MyTopic.MiddleTopic.*" });
+				channelB = postal.channel({ channel: "MyChannel", topic: "MyTopic.MiddleTopic" });
+				channelC = postal.channel({ channel: "MyChannel", topic: "MyTopic.MiddleTopic.SubTopic" });
+				channelD = postal.channel({ channel: "MyChannel", topic: "MyTopic.MiddleTopic.SubTopic.YetAnother" });
+				subscription = channel.subscribe(function(data) { count++; });
 
-                channelC.publish("Testing123");
-                channelB.publish("Testing123");
-                channelD.publish("Testing123");
-            });
-            after(function(){
-                postal.configuration.bus.subscriptions = {};
-                count = 0;
-            });
-            it("should have invoked subscription callback twice", function() {
-                assert(count).equals(2);
-            });
-        });
-        describe("When subscribing with a hierarchical binding, using # and *", function(){
-            var count = 0, channelB, channelC, channelD, channelE;
-            before(function(){
-                channel = postal.channel({ channel: "MyChannel", topic: "MyTopic.#.*" });
-                channelB = postal.channel({ channel: "MyChannel", topic: "MyTopic.MiddleTopic" });
-                channelC = postal.channel({ channel: "MyChannel", topic: "MyTopic.MiddleTopic.SubTopic" });
-                channelD = postal.channel({ channel: "MyChannel", topic: "MyTopic.MiddleTopic.SubTopic.YetAnother" });
-                channelE = postal.channel({ channel: "MyChannel", topic: "OtherTopic.MiddleTopic.SubTopic.YetAnother" });
-                subscription = channel.subscribe(function(data) { count++; });
+				channelC.publish("Testing123");
+				channelB.publish("Testing123");
+				channelD.publish("Testing123");
+			});
+			after(function(){
+				postal.configuration.bus.subscriptions = {};
+				count = 0;
+			});
+			it("should have invoked subscription callback twice", function() {
+				assert(count).equals(2);
+			});
+		});
+		describe("When subscribing with a hierarchical binding, using # and *", function(){
+			var count = 0, channelB, channelC, channelD, channelE;
+			before(function(){
+				channel = postal.channel({ channel: "MyChannel", topic: "MyTopic.#.*" });
+				channelB = postal.channel({ channel: "MyChannel", topic: "MyTopic.MiddleTopic" });
+				channelC = postal.channel({ channel: "MyChannel", topic: "MyTopic.MiddleTopic.SubTopic" });
+				channelD = postal.channel({ channel: "MyChannel", topic: "MyTopic.MiddleTopic.SubTopic.YetAnother" });
+				channelE = postal.channel({ channel: "MyChannel", topic: "OtherTopic.MiddleTopic.SubTopic.YetAnother" });
+				subscription = channel.subscribe(function(data) { count++; });
 
-                channelC.publish({channel: "MyChannel", topic: "MyTopic.MiddleTopic.SubTopic", data: "Testing123"});
-                channelB.publish({channel: "MyChannel", topic: "MyTopic.MiddleTopic", data: "Testing123"});
-                channelD.publish({channel: "MyChannel", topic: "MyTopic.MiddleTopic.SubTopic.YetAnother", data: "Testing123"});
-                channelE.publish({channel: "MyChannel", topic: "OtherTopic.MiddleTopic.SubTopic.YetAnother", data: "Testing123"});
-            });
-            after(function(){
-                postal.configuration.bus.subscriptions = {};
-                count = 0;
-            });
-            it("should have invoked subscription callback twice", function() {
-                assert(count).equals(2);
-            });
-        });
-        describe("When using shortcut publish api", function(){
-            var msgReceivedCnt = 0,
-                msgData;
-            before(function(){
-                channel = postal.channel({ channel: "MyChannel", topic: "MyTopic" });
-                subscription = channel.subscribe(function(data) { msgReceivedCnt++; msgData = data;});
-                postal.publish("MyChannel", "MyTopic", "Testing123");
-                subscription.unsubscribe();
-                postal.publish("MyChannel", "MyTopic", "Testing123");
-            });
-            after(function(){
-                postal.configuration.bus.subscriptions = {};
-            });
-            it("subscription callback should be invoked once", function(){
-                assert(msgReceivedCnt).equals(1);
-            });
-            it("subscription callback should receive published data", function(){
-                assert(msgData).equals("Testing123");
-            });
-        });
-        describe("When using shortcut subscribe api", function(){
-            before(function(){
-                subscription = postal.subscribe({
-	                channel: "MyChannel",
-	                topic: "MyTopic",
-	                callback: function() { }
-                });
-                sub = postal.configuration.bus.subscriptions.MyChannel.MyTopic[0];
-            });
-            after(function(){
-                postal.configuration.bus.subscriptions = {};
-            });
-            it("should create an channel called MyChannel", function(){
-                assert(postal.configuration.bus.subscriptions["MyChannel"] !== undefined).isTrue();
-            });
-            it("should create a topic under MyChannel called MyTopic", function(){
-                assert(postal.configuration.bus.subscriptions["MyChannel"]["MyTopic"] !== undefined).isTrue();
-            });
-            it("should have set subscription channel value", function() {
-                assert(sub.channel).equals("MyChannel");
-            });
-            it("should have set subscription topic value", function() {
-                assert(sub.topic).equals("MyTopic");
-            });
-            it("should have set subscription priority value", function() {
-                assert(sub.priority).equals(50);
-            });
-            it("should have defaulted the subscription constraints array", function() {
-                assert(sub.constraints.length).equals(0);
-            });
-            it("should have defaulted the subscription disposeAfter value", function() {
-                assert(sub.maxCalls).equals(0);
-            });
-            it("should have defaulted the subscription context value", function() {
-                assert(sub.context).isNull();
-            });
-        });
-	    describe("when subscribing and unsubscribing a wire tap", function() {
-		    var wireTapData,
-			    wireTapEnvelope,
-			    wiretap;
-		    before(function(){
-			    caughtUnsubscribeEvent = false;
-			    wireTapData = [];
-			    wireTapEnvelope = [];
-			    wiretap = postal.addWireTap(function(msg, envelope) {
-				    wireTapData.push(msg);
-				    wireTapEnvelope.push(envelope);
-			    });
-			    postal.publish({ topic: "Oh.Hai.There", data: "I'm in yer bus, tappin' yer subscriptionz..."});
-			    wiretap();
-			    postal.publish({ topic: "Oh.Hai.There", data: "I'm in yer bus, tappin' yer subscriptionz..."});
-		    });
-		    after(function(){
-			    postal.configuration.bus.subscriptions = {};
-		    });
-		    it("wire tap should have been invoked only once", function(){
-			    assert(wireTapData.length).equals(1);
-			    assert(wireTapEnvelope.length).equals(1);
-		    });
-		    it("wireTap data should match expected results", function(){
-			    assert(wireTapData[0]).equals("I'm in yer bus, tappin' yer subscriptionz...");
-		    });
-		    it("wireTap envelope should match expected results", function() {
-			    assert(wireTapEnvelope[0].channel).equals(DEFAULT_CHANNEL);
-			    assert(wireTapEnvelope[0].topic).equals("Oh.Hai.There");
-		    });
-	    });
-	    describe("when binding channel - one source to one destination", function(){
-		    describe("with only channel values provided", function(){
-			    var destData = [],
-				    destEnv = [],
-				    linkages;
-			    before(function(){
-				    linkages = postal.linkChannels({ channel: "sourceChannel" }, { channel: "destinationChannel" });
-				    console.log(JSON.stringify(linkages));
-				    subscription = postal.subscribe({ channel: "destinationChannel", topic: "Oh.Hai.There", callback: function(data, env) {
-					    destData.push(data);
-					    destEnv.push(env);
-				    }});
-				    postal.publish("sourceChannel", "Oh.Hai.There", { data: "I'm in yer bus, linkin' to yer subscriptionz..."});
-				    linkages[0].unsubscribe();
-				    postal.publish("sourceChannel", "Oh.Hai.There", { data: "I'm in yer bus, linkin' to yer subscriptionz..."});
-			    });
-			    after(function(){
-				    postal.configuration.bus.subscriptions = {};
-			    });
-			    it("linked subscription should only have been invoked once", function(){
-				    assert(destData.length).equals(1);
-				    assert(destEnv.length).equals(1);
-			    });
-			    it("linked subscription data should match expected results", function(){
-				    assert(destData[0].data).equals("I'm in yer bus, linkin' to yer subscriptionz...");
-			    });
-			    it("linked subscription envelope should match expected results", function() {
-				    assert(destEnv[0].channel).equals("destinationChannel");
-				    assert(destEnv[0].topic).equals("Oh.Hai.There");
-			    });
-		    });
-		    describe("with channel and static topic values provided", function(){
-			    var destData = [],
-				    destEnv = [],
-				    linkages;
-			    before(function(){
-				    linkages = postal.linkChannels({ channel: "sourceChannel", topic: "Oh.Hai.There"  }, { channel: "destinationChannel", topic: "kthxbye" });
-				    subscription = postal.subscribe({ channel: "destinationChannel", topic: "kthxbye", callback: function(data, env) {
-					    destData.push(data);
-					    destEnv.push(env);
-				    }});
-				    postal.publish("sourceChannel", "Oh.Hai.There", { data: "I'm in yer bus, linkin' to yer subscriptionz..."});
-				    linkages[0].unsubscribe();
-				    postal.publish("sourceChannel", "Oh.Hai.There", { data: "I'm in yer bus, linkin' to yer subscriptionz..."});
-			    });
-			    after(function(){
-				    postal.configuration.bus.subscriptions = {};
-			    });
-			    it("linked subscription should only have been invoked once", function(){
-				    assert(destData.length).equals(1);
-				    assert(destEnv.length).equals(1);
-			    });
-			    it("linked subscription data should match expected results", function(){
-				    assert(destData[0].data).equals("I'm in yer bus, linkin' to yer subscriptionz...");
-			    });
-			    it("linked subscription envelope should match expected results", function() {
-				    assert(destEnv[0].channel).equals("destinationChannel");
-				    assert(destEnv[0].topic).equals("kthxbye");
-			    });
-		    });
-		    describe("with channel and topic transform values provided", function(){
-			    var destData = [],
-				    destEnv = [],
-				    linkages;
-			    before(function(){
-				    linkages = postal.linkChannels({ channel: "sourceChannel"  }, { channel: "destinationChannel", topic: function(tpc) { return "NewTopic." + tpc; } });
-				    subscription = postal.subscribe({ channel: "destinationChannel", topic: "NewTopic.Oh.Hai.There", callback: function(data, env) {
-					    destData.push(data);
-					    destEnv.push(env);
-				    }});
-				    postal.publish("sourceChannel", "Oh.Hai.There", { data: "I'm in yer bus, linkin' to yer subscriptionz..."});
-				    linkages[0].unsubscribe();
-				    postal.publish("sourceChannel", "Oh.Hai.There", { data: "I'm in yer bus, linkin' to yer subscriptionz..."});
-			    });
-			    after(function(){
-				    postal.configuration.bus.subscriptions = {};
-			    });
-			    it("linked subscription should only have been invoked once", function(){
-				    assert(destData.length).equals(1);
-				    assert(destEnv.length).equals(1);
-			    });
-			    it("linked subscription data should match expected results", function(){
-				    assert(destData[0].data).equals("I'm in yer bus, linkin' to yer subscriptionz...");
-			    });
-			    it("linked subscription envelope should match expected results", function() {
-				    assert(destEnv[0].channel).equals("destinationChannel");
-				    assert(destEnv[0].topic).equals("NewTopic.Oh.Hai.There");
-			    });
-		    });
-	    });
-    });
+				channelC.publish({channel: "MyChannel", topic: "MyTopic.MiddleTopic.SubTopic", data: "Testing123"});
+				channelB.publish({channel: "MyChannel", topic: "MyTopic.MiddleTopic", data: "Testing123"});
+				channelD.publish({channel: "MyChannel", topic: "MyTopic.MiddleTopic.SubTopic.YetAnother", data: "Testing123"});
+				channelE.publish({channel: "MyChannel", topic: "OtherTopic.MiddleTopic.SubTopic.YetAnother", data: "Testing123"});
+			});
+			after(function(){
+				postal.configuration.bus.subscriptions = {};
+				count = 0;
+			});
+			it("should have invoked subscription callback twice", function() {
+				assert(count).equals(2);
+			});
+		});
+		describe("When using shortcut publish api", function(){
+			var msgReceivedCnt = 0,
+				msgData;
+			before(function(){
+				channel = postal.channel({ channel: "MyChannel", topic: "MyTopic" });
+				subscription = channel.subscribe(function(data) { msgReceivedCnt++; msgData = data;});
+				postal.publish("MyChannel", "MyTopic", "Testing123");
+				subscription.unsubscribe();
+				postal.publish("MyChannel", "MyTopic", "Testing123");
+			});
+			after(function(){
+				postal.configuration.bus.subscriptions = {};
+			});
+			it("subscription callback should be invoked once", function(){
+				assert(msgReceivedCnt).equals(1);
+			});
+			it("subscription callback should receive published data", function(){
+				assert(msgData).equals("Testing123");
+			});
+		});
+		describe("When using shortcut subscribe api", function(){
+			before(function(){
+				subscription = postal.subscribe({
+					channel: "MyChannel",
+					topic: "MyTopic",
+					callback: function() { }
+				});
+				sub = postal.configuration.bus.subscriptions.MyChannel.MyTopic[0];
+			});
+			after(function(){
+				postal.configuration.bus.subscriptions = {};
+			});
+			it("should create an channel called MyChannel", function(){
+				assert(postal.configuration.bus.subscriptions["MyChannel"] !== undefined).isTrue();
+			});
+			it("should create a topic under MyChannel called MyTopic", function(){
+				assert(postal.configuration.bus.subscriptions["MyChannel"]["MyTopic"] !== undefined).isTrue();
+			});
+			it("should have set subscription channel value", function() {
+				assert(sub.channel).equals("MyChannel");
+			});
+			it("should have set subscription topic value", function() {
+				assert(sub.topic).equals("MyTopic");
+			});
+			it("should have set subscription priority value", function() {
+				assert(sub.priority).equals(50);
+			});
+			it("should have defaulted the subscription constraints array", function() {
+				assert(sub.constraints.length).equals(0);
+			});
+			it("should have defaulted the subscription disposeAfter value", function() {
+				assert(sub.maxCalls).equals(0);
+			});
+			it("should have defaulted the subscription context value", function() {
+				assert(sub.context).isNull();
+			});
+		});
+		describe("when subscribing and unsubscribing a wire tap", function() {
+			var wireTapData,
+				wireTapEnvelope,
+				wiretap;
+			before(function(){
+				caughtUnsubscribeEvent = false;
+				wireTapData = [];
+				wireTapEnvelope = [];
+				wiretap = postal.addWireTap(function(msg, envelope) {
+					wireTapData.push(msg);
+					wireTapEnvelope.push(envelope);
+				});
+				postal.publish({ topic: "Oh.Hai.There", data: "I'm in yer bus, tappin' yer subscriptionz..."});
+				wiretap();
+				postal.publish({ topic: "Oh.Hai.There", data: "I'm in yer bus, tappin' yer subscriptionz..."});
+			});
+			after(function(){
+				postal.configuration.bus.subscriptions = {};
+			});
+			it("wire tap should have been invoked only once", function(){
+				assert(wireTapData.length).equals(1);
+				assert(wireTapEnvelope.length).equals(1);
+			});
+			it("wireTap data should match expected results", function(){
+				assert(wireTapData[0]).equals("I'm in yer bus, tappin' yer subscriptionz...");
+			});
+			it("wireTap envelope should match expected results", function() {
+				assert(wireTapEnvelope[0].channel).equals(DEFAULT_CHANNEL);
+				assert(wireTapEnvelope[0].topic).equals("Oh.Hai.There");
+			});
+		});
+		describe("when binding channel - one source to one destination", function(){
+			describe("with only channel values provided", function(){
+				var destData = [],
+					destEnv = [],
+					linkages;
+				before(function(){
+					linkages = postal.linkChannels({ channel: "sourceChannel" }, { channel: "destinationChannel" });
+					console.log(JSON.stringify(linkages));
+					subscription = postal.subscribe({ channel: "destinationChannel", topic: "Oh.Hai.There", callback: function(data, env) {
+						destData.push(data);
+						destEnv.push(env);
+					}});
+					postal.publish("sourceChannel", "Oh.Hai.There", { data: "I'm in yer bus, linkin' to yer subscriptionz..."});
+					linkages[0].unsubscribe();
+					postal.publish("sourceChannel", "Oh.Hai.There", { data: "I'm in yer bus, linkin' to yer subscriptionz..."});
+				});
+				after(function(){
+					postal.configuration.bus.subscriptions = {};
+				});
+				it("linked subscription should only have been invoked once", function(){
+					assert(destData.length).equals(1);
+					assert(destEnv.length).equals(1);
+				});
+				it("linked subscription data should match expected results", function(){
+					assert(destData[0].data).equals("I'm in yer bus, linkin' to yer subscriptionz...");
+				});
+				it("linked subscription envelope should match expected results", function() {
+					assert(destEnv[0].channel).equals("destinationChannel");
+					assert(destEnv[0].topic).equals("Oh.Hai.There");
+				});
+			});
+			describe("with channel and static topic values provided", function(){
+				var destData = [],
+					destEnv = [],
+					linkages;
+				before(function(){
+					linkages = postal.linkChannels({ channel: "sourceChannel", topic: "Oh.Hai.There"  }, { channel: "destinationChannel", topic: "kthxbye" });
+					subscription = postal.subscribe({ channel: "destinationChannel", topic: "kthxbye", callback: function(data, env) {
+						destData.push(data);
+						destEnv.push(env);
+					}});
+					postal.publish("sourceChannel", "Oh.Hai.There", { data: "I'm in yer bus, linkin' to yer subscriptionz..."});
+					linkages[0].unsubscribe();
+					postal.publish("sourceChannel", "Oh.Hai.There", { data: "I'm in yer bus, linkin' to yer subscriptionz..."});
+				});
+				after(function(){
+					postal.configuration.bus.subscriptions = {};
+				});
+				it("linked subscription should only have been invoked once", function(){
+					assert(destData.length).equals(1);
+					assert(destEnv.length).equals(1);
+				});
+				it("linked subscription data should match expected results", function(){
+					assert(destData[0].data).equals("I'm in yer bus, linkin' to yer subscriptionz...");
+				});
+				it("linked subscription envelope should match expected results", function() {
+					assert(destEnv[0].channel).equals("destinationChannel");
+					assert(destEnv[0].topic).equals("kthxbye");
+				});
+			});
+			describe("with channel and topic transform values provided", function(){
+				var destData = [],
+					destEnv = [],
+					linkages;
+				before(function(){
+					linkages = postal.linkChannels({ channel: "sourceChannel"  }, { channel: "destinationChannel", topic: function(tpc) { return "NewTopic." + tpc; } });
+					subscription = postal.subscribe({ channel: "destinationChannel", topic: "NewTopic.Oh.Hai.There", callback: function(data, env) {
+						destData.push(data);
+						destEnv.push(env);
+					}});
+					postal.publish("sourceChannel", "Oh.Hai.There", { data: "I'm in yer bus, linkin' to yer subscriptionz..."});
+					linkages[0].unsubscribe();
+					postal.publish("sourceChannel", "Oh.Hai.There", { data: "I'm in yer bus, linkin' to yer subscriptionz..."});
+				});
+				after(function(){
+					postal.configuration.bus.subscriptions = {};
+				});
+				it("linked subscription should only have been invoked once", function(){
+					assert(destData.length).equals(1);
+					assert(destEnv.length).equals(1);
+				});
+				it("linked subscription data should match expected results", function(){
+					assert(destData[0].data).equals("I'm in yer bus, linkin' to yer subscriptionz...");
+				});
+				it("linked subscription envelope should match expected results", function() {
+					assert(destEnv[0].channel).equals("destinationChannel");
+					assert(destEnv[0].topic).equals("NewTopic.Oh.Hai.There");
+				});
+			});
+		});
+	});
 });
\ No newline at end of file
diff --git a/spec/SubscriptionDefinition.spec.js b/spec/SubscriptionDefinition.spec.js
index 4b5dfa2..8752ca7 100644
--- a/spec/SubscriptionDefinition.spec.js
+++ b/spec/SubscriptionDefinition.spec.js
@@ -1,85 +1,85 @@
 QUnit.specify("postal.js", function(){
-    describe("SubscriptionDefinition", function(){
-        describe("When initializing SubscriptionDefinition", function() {
-            var sDef = new SubscriptionDefinition("TestChannel", "TestTopic", NO_OP);
-            it("should set the channel to TestChannel", function() {
-                assert(sDef.channel).equals("TestChannel");
-            });
-            it("should set the topic to TestTopic", function() {
-                assert(sDef.topic).equals("TestTopic");
-            });
-            it("should set the callback", function() {
-                assert(sDef.callback).equals(NO_OP);
-            });
-            it("should default the priority", function() {
-                assert(sDef.priority).equals(50);
-            });
-            it("should default the constraints", function() {
-                assert(sDef.constraints.length).equals(0);
-            });
-            it("should default the maxCalls", function() {
-                assert(sDef.maxCalls).equals(0);
-            });
-            it("should default the onHandled", function() {
-                assert(sDef.onHandled).equals(NO_OP);
-            });
-            it("should default the context", function() {
-                assert(sDef.context).isNull();
-            });
-        });
+	describe("SubscriptionDefinition", function(){
+		describe("When initializing SubscriptionDefinition", function() {
+			var sDef = new SubscriptionDefinition("TestChannel", "TestTopic", NO_OP);
+			it("should set the channel to TestChannel", function() {
+				assert(sDef.channel).equals("TestChannel");
+			});
+			it("should set the topic to TestTopic", function() {
+				assert(sDef.topic).equals("TestTopic");
+			});
+			it("should set the callback", function() {
+				assert(sDef.callback).equals(NO_OP);
+			});
+			it("should default the priority", function() {
+				assert(sDef.priority).equals(50);
+			});
+			it("should default the constraints", function() {
+				assert(sDef.constraints.length).equals(0);
+			});
+			it("should default the maxCalls", function() {
+				assert(sDef.maxCalls).equals(0);
+			});
+			it("should default the onHandled", function() {
+				assert(sDef.onHandled).equals(NO_OP);
+			});
+			it("should default the context", function() {
+				assert(sDef.context).isNull();
+			});
+		});
 
-        describe("When setting ignoreDuplicates", function(){
-            var sDefa = new SubscriptionDefinition("TestChannel", "TestTopic", NO_OP).ignoreDuplicates();
+		describe("When setting ignoreDuplicates", function(){
+			var sDefa = new SubscriptionDefinition("TestChannel", "TestTopic", NO_OP).ignoreDuplicates();
 
-            it("Should add a DistinctPredicate constraint to the configuration constraints", function() {
-                assert(sDefa.constraints.length).equals(1);
-            });
-        });
+			it("Should add a DistinctPredicate constraint to the configuration constraints", function() {
+				assert(sDefa.constraints.length).equals(1);
+			});
+		});
 
-        describe("When adding a constraint", function(){
-            var sDefb = new SubscriptionDefinition("TestChannel", "TestTopic", NO_OP).withConstraint(function() { });
+		describe("When adding a constraint", function(){
+			var sDefb = new SubscriptionDefinition("TestChannel", "TestTopic", NO_OP).withConstraint(function() { });
 
-            it("Should add a constraint", function() {
-                assert(sDefb.constraints.length).equals(1);
-            });
-        });
+			it("Should add a constraint", function() {
+				assert(sDefb.constraints.length).equals(1);
+			});
+		});
 
-        describe("When adding multiple constraints", function(){
-            var sDefc = new SubscriptionDefinition("TestChannel", "TestTopic", NO_OP).withConstraints([function() { }, function() { }, function() { }]);
+		describe("When adding multiple constraints", function(){
+			var sDefc = new SubscriptionDefinition("TestChannel", "TestTopic", NO_OP).withConstraints([function() { }, function() { }, function() { }]);
 
-            it("Should add a constraint", function() {
-                assert(sDefc.constraints.length).equals(3);
-            });
-        });
+			it("Should add a constraint", function() {
+				assert(sDefc.constraints.length).equals(3);
+			});
+		});
 
-        describe("When setting the context", function(){
-            var obj = {},
-                sDefd = new SubscriptionDefinition("TestChannel", "TestTopic", NO_OP).withContext(obj);
+		describe("When setting the context", function(){
+			var obj = {},
+				sDefd = new SubscriptionDefinition("TestChannel", "TestTopic", NO_OP).withContext(obj);
 
-            it("Should set context", function() {
-                assert(sDefd.context).equals(obj);
-            });
-        });
+			it("Should set context", function() {
+				assert(sDefd.context).equals(obj);
+			});
+		});
 
-        describe("When setting priority", function(){
-            var sDefe = new SubscriptionDefinition("TestChannel", "TestTopic", NO_OP).withPriority(10);
+		describe("When setting priority", function(){
+			var sDefe = new SubscriptionDefinition("TestChannel", "TestTopic", NO_OP).withPriority(10);
 
-            it("Should set priority", function() {
-                assert(sDefe.priority).equals(10);
-            });
-        });
+			it("Should set priority", function() {
+				assert(sDefe.priority).equals(10);
+			});
+		});
 
-        describe("When setting whenHandledThenExecute", function(){
-            var sDeff = new SubscriptionDefinition("TestChannel", "TestTopic", NO_OP).whenHandledThenExecute(function() { });
+		describe("When setting whenHandledThenExecute", function(){
+			var sDeff = new SubscriptionDefinition("TestChannel", "TestTopic", NO_OP).whenHandledThenExecute(function() { });
 
-            it("Should add an onHandled callback", function() {
-                assert(typeof sDeff.onHandled).equals("function");
-            });
-            it("Should not equal NO_OP", function() {
-                assert(sDeff.onHandled).isNotEqualTo(NO_OP);
-            });
-        });
+			it("Should add an onHandled callback", function() {
+				assert(typeof sDeff.onHandled).equals("function");
+			});
+			it("Should not equal NO_OP", function() {
+				assert(sDeff.onHandled).isNotEqualTo(NO_OP);
+			});
+		});
 
-        //TODO:  need to determine best way to add tests for defer, debounce, throttle, delay & disposeAfter
-    });
+		//TODO:  need to determine best way to add tests for defer, debounce, throttle, delay & disposeAfter
+	});
 });
diff --git a/spec/runner.html b/spec/runner.html
index 4a8919d..83c1e58 100644
--- a/spec/runner.html
+++ b/spec/runner.html
@@ -1,28 +1,28 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-<script type="text/javascript" src="../ext/jquery-1.5.2.js"></script>
-<script type="text/javascript" src="../ext/qunit.js"></script>
-<script type="text/javascript" src="../ext/pavlov.js"></script>
-<script type="text/javascript" src="../ext/amplify.core.js"></script>
-<script type="text/javascript" src="../ext/amplify.store.js"></script>
-<script type="text/javascript" src="../ext/underscore.js"></script>
-<script type="text/javascript" src="../src/main/Constants.js"></script>
-<script type="text/javascript" src="../src/main/DistinctPredicate.js"></script>
-<script type="text/javascript" src="../src/main/ChannelDefinition.js"></script>
-<script type="text/javascript" src="../src/main/SubscriptionDefinition.js"></script>
-<script type="text/javascript" src="../src/main/BindingsResolver.js"></script>
-<script type="text/javascript" src="../src/main/LocalBus.js"></script>
-<script type="text/javascript" src="../src/main/Api.js"></script>
-<script type="text/javascript" src="DistinctPredicate.spec.js"></script>
-<script type="text/javascript" src="ChannelDefinition.spec.js"></script>
-<script type="text/javascript" src="SubscriptionDefinition.spec.js"></script>
-<script type="text/javascript" src="BindingsResolver.spec.js"></script>
-<script type="text/javascript" src="Postal.spec.js"></script>
-<link rel="stylesheet" href="../ext/qunit.css" type="text/css" media="screen" />
+	<script type="text/javascript" src="../ext/jquery-1.5.2.js"></script>
+	<script type="text/javascript" src="../ext/qunit.js"></script>
+	<script type="text/javascript" src="../ext/pavlov.js"></script>
+	<script type="text/javascript" src="../ext/amplify.core.js"></script>
+	<script type="text/javascript" src="../ext/amplify.store.js"></script>
+	<script type="text/javascript" src="../ext/underscore.js"></script>
+	<script type="text/javascript" src="../src/main/Constants.js"></script>
+	<script type="text/javascript" src="../src/main/DistinctPredicate.js"></script>
+	<script type="text/javascript" src="../src/main/ChannelDefinition.js"></script>
+	<script type="text/javascript" src="../src/main/SubscriptionDefinition.js"></script>
+	<script type="text/javascript" src="../src/main/BindingsResolver.js"></script>
+	<script type="text/javascript" src="../src/main/LocalBus.js"></script>
+	<script type="text/javascript" src="../src/main/Api.js"></script>
+	<script type="text/javascript" src="DistinctPredicate.spec.js"></script>
+	<script type="text/javascript" src="ChannelDefinition.spec.js"></script>
+	<script type="text/javascript" src="SubscriptionDefinition.spec.js"></script>
+	<script type="text/javascript" src="BindingsResolver.spec.js"></script>
+	<script type="text/javascript" src="Postal.spec.js"></script>
+	<link rel="stylesheet" href="../ext/qunit.css" type="text/css" media="screen" />
 </head>
 <body>
-    <h1 id="qunit-header"></h1>
+	<h1 id="qunit-header"></h1>
 	<h2 id="qunit-banner"></h2>
 	<div id="qunit-testrunner-toolbar"></div>
 	<h2 id="qunit-userAgent"></h2>
diff --git a/src/main/BindingsResolver.js b/src/main/BindingsResolver.js
index da1d5a3..7557302 100644
--- a/src/main/BindingsResolver.js
+++ b/src/main/BindingsResolver.js
@@ -1,21 +1,21 @@
 var bindingsResolver = {
-    cache: { },
+	cache: { },
 
-    compare: function(binding, topic) {
-        if(this.cache[topic] && this.cache[topic][binding]) {
-            return true;
-        }
-	    //  binding.replace(/\./g,"\\.")             // escape actual periods
-	    //         .replace(/\*/g, ".*")             // asterisks match any value
-	    //         .replace(/#/g, "[A-Z,a-z,0-9]*"); // hash matches any alpha-numeric 'word'
-        var rgx = new RegExp("^" + binding.replace(/\./g,"\\.").replace(/\*/g, ".*").replace(/#/g, "[A-Z,a-z,0-9]*") + "$"),
-            result = rgx.test(topic);
-        if(result) {
-            if(!this.cache[topic]) {
-                this.cache[topic] = {};
-            }
-            this.cache[topic][binding] = true;
-        }
-        return result;
-    }
+	compare: function(binding, topic) {
+		if(this.cache[topic] && this.cache[topic][binding]) {
+			return true;
+		}
+		//  binding.replace(/\./g,"\\.")             // escape actual periods
+		//         .replace(/\*/g, ".*")             // asterisks match any value
+		//         .replace(/#/g, "[A-Z,a-z,0-9]*"); // hash matches any alpha-numeric 'word'
+		var rgx = new RegExp("^" + binding.replace(/\./g,"\\.").replace(/\*/g, ".*").replace(/#/g, "[A-Z,a-z,0-9]*") + "$"),
+			result = rgx.test(topic);
+		if(result) {
+			if(!this.cache[topic]) {
+				this.cache[topic] = {};
+			}
+			this.cache[topic][binding] = true;
+		}
+		return result;
+	}
 };
diff --git a/src/main/ChannelDefinition.js b/src/main/ChannelDefinition.js
index 8db0848..c5ae132 100644
--- a/src/main/ChannelDefinition.js
+++ b/src/main/ChannelDefinition.js
@@ -1,33 +1,33 @@
 var ChannelDefinition = function(channelName, defaultTopic) {
-    this.channel = channelName || DEFAULT_CHANNEL;
-    this._topic = defaultTopic || "";
+	this.channel = channelName || DEFAULT_CHANNEL;
+	this._topic = defaultTopic || "";
 };
 
 ChannelDefinition.prototype = {
-    subscribe: function() {
-        var len = arguments.length;
-	    if(len === 1) {
-		    return new SubscriptionDefinition(this.channel, this._topic, arguments[0]);
-	    }
-	    else if (len === 2) {
-		    return new SubscriptionDefinition(this.channel, arguments[0], arguments[1]);
-	    }
-    },
+	subscribe: function() {
+		var len = arguments.length;
+		if(len === 1) {
+			return new SubscriptionDefinition(this.channel, this._topic, arguments[0]);
+		}
+		else if (len === 2) {
+			return new SubscriptionDefinition(this.channel, arguments[0], arguments[1]);
+		}
+	},
 
-    publish: function(obj) {
-	    var envelope = {
-		    channel: this.channel,
-		    topic: this._topic,
-		    data: obj
-	    };
-	    // If this is an envelope....
-	    if( obj.topic && obj.data ) {
-		    envelope = obj;
-		    envelope.channel = envelope.channel || this.channel;
-	    }
-	    envelope.timeStamp = new Date();
+	publish: function(obj) {
+		var envelope = {
+			channel: this.channel,
+			topic: this._topic,
+			data: obj
+		};
+		// If this is an envelope....
+		if( obj.topic && obj.data ) {
+			envelope = obj;
+			envelope.channel = envelope.channel || this.channel;
+		}
+		envelope.timeStamp = new Date();
 		postal.configuration.bus.publish(envelope);
-    },
+	},
 
 	topic: function(topic) {
 		if(topic === this._topic) {
diff --git a/src/main/Constants.js b/src/main/Constants.js
index ac13e2a..411258a 100644
--- a/src/main/Constants.js
+++ b/src/main/Constants.js
@@ -1,5 +1,5 @@
 var DEFAULT_CHANNEL = "/",
-    DEFAULT_PRIORITY = 50,
-    DEFAULT_DISPOSEAFTER = 0,
-    SYSTEM_CHANNEL = "postal",
-    NO_OP = function() { };
+	DEFAULT_PRIORITY = 50,
+	DEFAULT_DISPOSEAFTER = 0,
+	SYSTEM_CHANNEL = "postal",
+	NO_OP = function() { };
diff --git a/src/main/DistinctPredicate.js b/src/main/DistinctPredicate.js
index a6abd18..6e443be 100644
--- a/src/main/DistinctPredicate.js
+++ b/src/main/DistinctPredicate.js
@@ -1,15 +1,15 @@
 var DistinctPredicate = function() {
-    var previous;
-    return function(data) {
-        var eq = false;
-        if(_.isString(data)) {
-            eq = data === previous;
-            previous = data;
-        }
-        else {
-            eq = _.isEqual(data, previous);
-            previous = _.clone(data);
-        }
-        return !eq;
-    };
+	var previous;
+	return function(data) {
+		var eq = false;
+		if(_.isString(data)) {
+			eq = data === previous;
+			previous = data;
+		}
+		else {
+			eq = _.isEqual(data, previous);
+			previous = _.clone(data);
+		}
+		return !eq;
+	};
 };
diff --git a/src/main/SubscriptionDefinition.js b/src/main/SubscriptionDefinition.js
index 55a86ec..31fa801 100644
--- a/src/main/SubscriptionDefinition.js
+++ b/src/main/SubscriptionDefinition.js
@@ -8,14 +8,14 @@ var SubscriptionDefinition = function(channel, topic, callback) {
 	this.onHandled = NO_OP;
 	this.context = null;
 	postal.configuration.bus.publish({
-			channel: SYSTEM_CHANNEL,
-			topic: "subscription.created",
-			timeStamp: new Date(),
-			data: {
-				event: "subscription.created",
-				channel: channel,
-				topic: topic
-			}
+		channel: SYSTEM_CHANNEL,
+		topic: "subscription.created",
+		timeStamp: new Date(),
+		data: {
+			event: "subscription.created",
+			channel: channel,
+			topic: topic
+		}
 	});
 
 	postal.configuration.bus.subscribe(this);
diff --git a/src/main/VersionHeader.js b/src/main/VersionHeader.js
index 388e7f2..d61c1cd 100644
--- a/src/main/VersionHeader.js
+++ b/src/main/VersionHeader.js
@@ -1,6 +1,6 @@
 /*
-    postal.js
-    Author: Jim Cowart
-    License: Dual licensed MIT (http://www.opensource.org/licenses/mit-license) & GPL (http://www.opensource.org/licenses/gpl-license)
-    Version 0.6.0
-*/
+	postal.js
+	Author: Jim Cowart
+	License: Dual licensed MIT (http://www.opensource.org/licenses/mit-license) & GPL (http://www.opensource.org/licenses/gpl-license)
+	Version 0.6.0
+ */