diff --git a/lib/node/package.json b/lib/node/package.json
index 677d4b1..2c203e7 100644
--- a/lib/node/package.json
+++ b/lib/node/package.json
@@ -1,7 +1,7 @@
 {
     "name" : "postal",
     "description" : "Pub/Sub library providing wildcard subscriptions, complex message handling, etc.  Works server and client-side.",
-    "version" : "0.6.0",
+    "version" : "0.6.1",
     "homepage" : "http://github.com/ifandelse/postal.js",
     "repository" : {
         "type" : "git",
diff --git a/lib/postal.amd.js b/lib/postal.amd.js
new file mode 100644
index 0000000..13e8427
--- /dev/null
+++ b/lib/postal.amd.js
@@ -0,0 +1,481 @@
+/*
+ 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.1
+ */
+
+// This is the amd-module version of postal.js
+// If you need the standard lib style version, go to http://github.com/ifandelse/postal.js
+define( ["underscore"], function ( _, 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 _obj = 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 );
+		return 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;
+	},
+
+	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( function () {
+				fn( data );
+			}, milliseconds );
+		};
+		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 ( callback ) {
+		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;
+	},
+
+	reset : function () {
+		this.cache = {};
+	}
+};
+
+var localBus = {
+
+	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 );
+			}
+		};
+	},
+
+	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, envelope );
+					} ) ) {
+						if ( typeof subDef.callback === 'function' ) {
+							subDef.callback.apply( subDef.context, [envelope.data, envelope] );
+							subDef.onHandled();
+						}
+					}
+				}
+			} );
+		} );
+	},
+
+	reset : function () {
+		if ( this.subscriptions ) {
+			_.each( this.subscriptions, function ( channel ) {
+				_.each( channel, function ( topic ) {
+					while ( topic.length ) {
+						topic.pop().unsubscribe();
+					}
+				} );
+			} );
+			this.subscriptions = {};
+		}
+	},
+
+	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;
+	},
+
+	subscriptions : {},
+
+	wireTaps : new Array( 0 ),
+
+	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;
+				}
+			}
+		}
+	}
+};
+
+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 );
+			return envelope;
+		},
+		"2" : function ( topic, data ) {
+			var envelope = { channel : DEFAULT_CHANNEL, topic : topic, timeStamp : new Date(), data : data };
+			postal.configuration.bus.publish( envelope );
+			return envelope;
+		},
+		"3" : function ( channel, topic, data ) {
+			var envelope = { channel : channel, topic : topic, timeStamp : new Date(), data : data };
+			postal.configuration.bus.publish( envelope );
+			return envelope;
+		}
+	},
+	channelPicker = {
+		"1" : function ( chn ) {
+			var channel = chn, topic, options = {};
+			if ( Object.prototype.toString.call( channel ) === "[object String]" ) {
+				channel = DEFAULT_CHANNEL;
+				topic = chn;
+			}
+			else {
+				channel = chn.channel || DEFAULT_CHANNEL;
+				topic = chn.topic;
+				options = chn.options || options;
+			}
+			return new postal.channelTypes[ options.type || "local" ]( channel, topic );
+		},
+		"2" : function ( chn, tpc ) {
+			var channel = chn, topic = tpc, options = {};
+			if ( Object.prototype.toString.call( tpc ) === "[object Object]" ) {
+				channel = DEFAULT_CHANNEL;
+				topic = chn;
+				options = tpc;
+			}
+			return new postal.channelTypes[ options.type || "local" ]( channel, topic );
+		},
+		"3" : function ( channel, topic, options ) {
+			return new postal.channelTypes[ options.type || "local" ]( channel, topic );
+		}
+	},
+	sessionInfo = {};
+
+// save some setup time, albeit tiny
+localBus.subscriptions[SYSTEM_CHANNEL] = {};
+
+var postal = {
+	configuration : {
+		bus : localBus,
+		resolver : bindingsResolver,
+		DEFAULT_CHANNEL : DEFAULT_CHANNEL,
+		DEFAULT_PRIORITY : DEFAULT_PRIORITY,
+		DEFAULT_DISPOSEAFTER : DEFAULT_DISPOSEAFTER,
+		SYSTEM_CHANNEL : SYSTEM_CHANNEL
+	},
+
+	channelTypes : {
+		local : ChannelDefinition
+	},
+
+	channel : function () {
+		var len = arguments.length;
+		if ( channelPicker[len] ) {
+			return channelPicker[len].apply( this, arguments );
+		}
+	},
+
+	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] ) {
+			return 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;
+	},
+
+	utils : {
+		getSubscribersFor : function () {
+			var channel = arguments[ 0 ],
+				tpc = arguments[ 1 ],
+				result = [];
+			if ( arguments.length === 1 ) {
+				if ( Object.prototype.toString.call( channel ) === "[object String]" ) {
+					channel = postal.configuration.DEFAULT_CHANNEL;
+					tpc = arguments[ 0 ];
+				}
+				else {
+					channel = arguments[ 0 ].channel || postal.configuration.DEFAULT_CHANNEL;
+					tpc = arguments[ 0 ].topic;
+				}
+			}
+			if ( postal.configuration.bus.subscriptions[ channel ] &&
+			     postal.configuration.bus.subscriptions[ channel ].hasOwnProperty( tpc ) ) {
+				result = postal.configuration.bus.subscriptions[ channel ][ tpc ];
+			}
+			return result;
+		},
+
+		reset : function () {
+			postal.configuration.bus.reset();
+			postal.configuration.resolver.reset();
+		}
+	}
+};
+
+	return postal;
+} );
\ No newline at end of file
diff --git a/lib/postal.amd.min.js b/lib/postal.amd.min.js
new file mode 100644
index 0000000..a58a803
--- /dev/null
+++ b/lib/postal.amd.min.js
@@ -0,0 +1 @@
+define(["underscore"],function(a,b){var c="/",d=50,e=0,f="postal",g=function(){},h=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}},i=function(a,b){this.channel=a||c,this._topic=b||""};i.prototype={subscribe:function(){var a=arguments.length;if(a===1)return new j(this.channel,this._topic,arguments[0]);if(a===2)return new j(this.channel,arguments[0],arguments[1])},publish:function(a){var b=a||{},c={channel:this.channel,topic:this._topic,data:b};return b.topic&&b.data&&(c=b,c.channel=c.channel||this.channel),c.timeStamp=new Date,p.configuration.bus.publish(c),c},topic:function(a){return a===this._topic?this:new i(this.channel,a)}};var j=function(a,b,c){this.channel=a,this.topic=b,this.callback=c,this.priority=d,this.constraints=new Array(0),this.maxCalls=e,this.onHandled=g,this.context=null,p.configuration.bus.publish({channel:f,topic:"subscription.created",timeStamp:new Date,data:{event:"subscription.created",channel:a,topic:b}}),p.configuration.bus.subscribe(this)};j.prototype={unsubscribe:function(){p.configuration.bus.unsubscribe(this),p.configuration.bus.publish({channel:f,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 h),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(function(){c(a)},b)},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=a,this}};var k={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},reset:function(){this.cache={}}},l={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)}},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,b)})&&typeof c.callback=="function"&&(c.callback.apply(c.context,[b.data,b]),c.onHandled())})})},reset:function(){this.subscriptions&&(a.each(this.subscriptions,function(b){a.each(b,function(a){while(a.length)a.pop().unsubscribe()})}),this.subscriptions={})},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},subscriptions:{},wireTaps:new Array(0),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}}}},m={1:function(a){if(!a)throw new Error("publishing from the 'global' postal.publish call requires a valid envelope.");return a.channel=a.channel||c,a.timeStamp=new Date,p.configuration.bus.publish(a),a},2:function(a,b){var d={channel:c,topic:a,timeStamp:new Date,data:b};return p.configuration.bus.publish(d),d},3:function(a,b,c){var d={channel:a,topic:b,timeStamp:new Date,data:c};return p.configuration.bus.publish(d),d}},n={1:function(a){var b=a,d,e={};return Object.prototype.toString.call(b)==="[object String]"?(b=c,d=a):(b=a.channel||c,d=a.topic,e=a.options||e),new p.channelTypes[e.type||"local"](b,d)},2:function(a,b){var d=a,e=b,f={};return Object.prototype.toString.call(b)==="[object Object]"&&(d=c,e=a,f=b),new p.channelTypes[f.type||"local"](d,e)},3:function(a,b,c){return new p.channelTypes[c.type||"local"](a,b)}},o={};l.subscriptions[f]={};var p={configuration:{bus:l,resolver:k,DEFAULT_CHANNEL:c,DEFAULT_PRIORITY:d,DEFAULT_DISPOSEAFTER:e,SYSTEM_CHANNEL:f},channelTypes:{local:i},channel:function(){var a=arguments.length;if(n[a])return n[a].apply(this,arguments)},subscribe:function(a){var b=a.callback,d=a.topic,e=a.channel||c;return new j(e,d,b)},publish:function(){var a=arguments.length;if(m[a])return m[a].apply(this,arguments)},addWireTap:function(a){return this.configuration.bus.addWireTap(a)},linkChannels:function(b,d){var e=[];return a.isArray(b)||(b=[b]),a.isArray(d)||(d=[d]),a.each(b,function(b){var f=b.topic||"*";a.each(d,function(d){var f=d.channel||c;e.push(p.subscribe({channel:b.channel||c,topic:b.topic||"*",callback:function(b,c){var e=c;e.topic=a.isFunction(d.topic)?d.topic(c.topic):d.topic||c.topic,e.channel=f,e.data=b,p.publish(e)}}))})}),e},utils:{getSubscribersFor:function(){var a=arguments[0],b=arguments[1],c=[];return arguments.length===1&&(Object.prototype.toString.call(a)==="[object String]"?(a=p.configuration.DEFAULT_CHANNEL,b=arguments[0]):(a=arguments[0].channel||p.configuration.DEFAULT_CHANNEL,b=arguments[0].topic)),p.configuration.bus.subscriptions[a]&&p.configuration.bus.subscriptions[a].hasOwnProperty(b)&&(c=p.configuration.bus.subscriptions[a][b]),c},reset:function(){p.configuration.bus.reset(),p.configuration.resolver.reset()}}};return p})
\ No newline at end of file
diff --git a/lib/postal.diagnostics.amd.js b/lib/postal.diagnostics.amd.js
new file mode 100644
index 0000000..168df84
--- /dev/null
+++ b/lib/postal.diagnostics.amd.js
@@ -0,0 +1,89 @@
+// This is the amd module version of postal.diagnostics.js
+// If you need the standard lib version, go to http://github.com/ifandelse/postal.js
+define( [ "postal", "underscore" ], function ( postal, _, undefined ) {
+
+	var filters = [],
+		applyFilter = function ( filter, env ) {
+			var match = 0, possible = 0;
+			_.each( filter, function ( item, key ) {
+				if ( env[key] ) {
+					possible++;
+					if ( _.isRegExp( item ) && item.test( env[key] ) ) {
+						match++;
+					}
+					else if ( _.isObject( env[key] ) && !_.isArray( env[key] ) ) {
+						if ( applyFilter( item, env[key] ) ) {
+							match++;
+						}
+					}
+					else {
+						if ( _.isEqual( env[key], item ) ) {
+							match++;
+						}
+					}
+				}
+			} );
+			return match === possible;
+		};
+	
+	// this returns a callback that, if invoked, removes the wireTap
+	var wireTap = postal.addWireTap( function ( data, envelope ) {
+		if ( !filters.length || _.any( filters, function ( filter ) {
+			return applyFilter( filter, envelope );
+		} ) ) {
+			if ( !JSON ) {
+				throw "This browser or environment does not provide JSON support";
+			}
+			try {
+				console.log( JSON.stringify( envelope ) );
+			}
+			catch ( exception ) {
+				try {
+					var env = _.extend( {}, envelope );
+					delete env.data;
+					console.log( JSON.stringify( env ) + "\n\t" + "JSON.stringify Error: " + exception.message );
+				}
+				catch ( ex ) {
+					console.log( "Unable to parse data to JSON: " + exception );
+				}
+			}
+		}
+	} );
+	
+	postal.diagnostics = postal.diagnostics || {};
+	
+	postal.diagnostics.console = {
+		clearFilters : function () {
+			filters = [];
+		},
+		removeFilter : function ( filter ) {
+			filters = _.filter( filters, function ( item ) {
+				return !_.isEqual( item, filter );
+			} );
+		},
+		addFilter : function ( constraint ) {
+			if ( !_.isArray( constraint ) ) {
+				constraint = [ constraint ];
+			}
+			_.each( constraint, function ( item ) {
+				if ( filters.length === 0 || !_.any( filters, function ( filter ) {
+					return _.isEqual( filter, item );
+				} ) ) {
+					filters.push( item );
+				}
+			} );
+	
+		},
+		getCurrentFilters : function () {
+			return filters;
+		},
+		removeWireTap : function () {
+			if ( wireTap ) {
+				wireTap();
+			}
+		}
+	};
+	
+	
+
+} );
\ No newline at end of file
diff --git a/lib/postal.diagnostics.amd.min.js b/lib/postal.diagnostics.amd.min.js
new file mode 100644
index 0000000..46a5dc2
--- /dev/null
+++ b/lib/postal.diagnostics.amd.min.js
@@ -0,0 +1 @@
+define(["postal","underscore"],function(a,b,c){var d=[],e=function(a,c){var d=0,f=0;return b.each(a,function(a,g){c[g]&&(f++,b.isRegExp(a)&&a.test(c[g])?d++:b.isObject(c[g])&&!b.isArray(c[g])?e(a,c[g])&&d++:b.isEqual(c[g],a)&&d++)}),d===f},f=a.addWireTap(function(a,c){if(!d.length||b.any(d,function(a){return e(a,c)})){if(!JSON)throw"This browser or environment does not provide JSON support";try{console.log(JSON.stringify(c))}catch(f){try{var g=b.extend({},c);delete g.data,console.log(JSON.stringify(g)+"\n	"+"JSON.stringify Error: "+f.message)}catch(h){console.log("Unable to parse data to JSON: "+f)}}}});a.diagnostics=a.diagnostics||{},a.diagnostics.console={clearFilters:function(){d=[]},removeFilter:function(a){d=b.filter(d,function(c){return!b.isEqual(c,a)})},addFilter:function(a){b.isArray(a)||(a=[a]),b.each(a,function(a){(d.length===0||!b.any(d,function(c){return b.isEqual(c,a)}))&&d.push(a)})},getCurrentFilters:function(){return d},removeWireTap:function(){f&&f()}}})
\ No newline at end of file
diff --git a/lib/postal.diagnostics.node.js b/lib/postal.diagnostics.node.js
new file mode 100644
index 0000000..b9f1222
--- /dev/null
+++ b/lib/postal.diagnostics.node.js
@@ -0,0 +1,85 @@
+module.exports = function ( _, postal ) {
+	var filters = [],
+		applyFilter = function ( filter, env ) {
+			var match = 0, possible = 0;
+			_.each( filter, function ( item, key ) {
+				if ( env[key] ) {
+					possible++;
+					if ( _.isRegExp( item ) && item.test( env[key] ) ) {
+						match++;
+					}
+					else if ( _.isObject( env[key] ) && !_.isArray( env[key] ) ) {
+						if ( applyFilter( item, env[key] ) ) {
+							match++;
+						}
+					}
+					else {
+						if ( _.isEqual( env[key], item ) ) {
+							match++;
+						}
+					}
+				}
+			} );
+			return match === possible;
+		};
+	
+	// this returns a callback that, if invoked, removes the wireTap
+	var wireTap = postal.addWireTap( function ( data, envelope ) {
+		if ( !filters.length || _.any( filters, function ( filter ) {
+			return applyFilter( filter, envelope );
+		} ) ) {
+			if ( !JSON ) {
+				throw "This browser or environment does not provide JSON support";
+			}
+			try {
+				console.log( JSON.stringify( envelope ) );
+			}
+			catch ( exception ) {
+				try {
+					var env = _.extend( {}, envelope );
+					delete env.data;
+					console.log( JSON.stringify( env ) + "\n\t" + "JSON.stringify Error: " + exception.message );
+				}
+				catch ( ex ) {
+					console.log( "Unable to parse data to JSON: " + exception );
+				}
+			}
+		}
+	} );
+	
+	postal.diagnostics = postal.diagnostics || {};
+	
+	postal.diagnostics.console = {
+		clearFilters : function () {
+			filters = [];
+		},
+		removeFilter : function ( filter ) {
+			filters = _.filter( filters, function ( item ) {
+				return !_.isEqual( item, filter );
+			} );
+		},
+		addFilter : function ( constraint ) {
+			if ( !_.isArray( constraint ) ) {
+				constraint = [ constraint ];
+			}
+			_.each( constraint, function ( item ) {
+				if ( filters.length === 0 || !_.any( filters, function ( filter ) {
+					return _.isEqual( filter, item );
+				} ) ) {
+					filters.push( item );
+				}
+			} );
+	
+		},
+		getCurrentFilters : function () {
+			return filters;
+		},
+		removeWireTap : function () {
+			if ( wireTap ) {
+				wireTap();
+			}
+		}
+	};
+	
+	
+};
\ No newline at end of file
diff --git a/lib/postal.diagnostics.node.min.js b/lib/postal.diagnostics.node.min.js
new file mode 100644
index 0000000..aec72f5
--- /dev/null
+++ b/lib/postal.diagnostics.node.min.js
@@ -0,0 +1 @@
+module.exports=function(a,b){var c=[],d=function(b,c){var e=0,f=0;return a.each(b,function(b,g){c[g]&&(f++,a.isRegExp(b)&&b.test(c[g])?e++:a.isObject(c[g])&&!a.isArray(c[g])?d(b,c[g])&&e++:a.isEqual(c[g],b)&&e++)}),e===f},e=b.addWireTap(function(b,e){if(!c.length||a.any(c,function(a){return d(a,e)})){if(!JSON)throw"This browser or environment does not provide JSON support";try{console.log(JSON.stringify(e))}catch(f){try{var g=a.extend({},e);delete g.data,console.log(JSON.stringify(g)+"\n	"+"JSON.stringify Error: "+f.message)}catch(h){console.log("Unable to parse data to JSON: "+f)}}}});b.diagnostics=b.diagnostics||{},b.diagnostics.console={clearFilters:function(){c=[]},removeFilter:function(b){c=a.filter(c,function(c){return!a.isEqual(c,b)})},addFilter:function(b){a.isArray(b)||(b=[b]),a.each(b,function(b){(c.length===0||!a.any(c,function(c){return a.isEqual(c,b)}))&&c.push(b)})},getCurrentFilters:function(){return c},removeWireTap:function(){e&&e()}}}
\ No newline at end of file
diff --git a/lib/postal.diagnostics.standard.js b/lib/postal.diagnostics.standard.js
new file mode 100644
index 0000000..eeeb2ca
--- /dev/null
+++ b/lib/postal.diagnostics.standard.js
@@ -0,0 +1,89 @@
+// This is the standard lib version of postal.diagnostics.js
+// If you need the amd-module style version, go to http://github.com/ifandelse/postal.js
+(function ( postal, _, undefined ) {
+
+	var filters = [],
+		applyFilter = function ( filter, env ) {
+			var match = 0, possible = 0;
+			_.each( filter, function ( item, key ) {
+				if ( env[key] ) {
+					possible++;
+					if ( _.isRegExp( item ) && item.test( env[key] ) ) {
+						match++;
+					}
+					else if ( _.isObject( env[key] ) && !_.isArray( env[key] ) ) {
+						if ( applyFilter( item, env[key] ) ) {
+							match++;
+						}
+					}
+					else {
+						if ( _.isEqual( env[key], item ) ) {
+							match++;
+						}
+					}
+				}
+			} );
+			return match === possible;
+		};
+	
+	// this returns a callback that, if invoked, removes the wireTap
+	var wireTap = postal.addWireTap( function ( data, envelope ) {
+		if ( !filters.length || _.any( filters, function ( filter ) {
+			return applyFilter( filter, envelope );
+		} ) ) {
+			if ( !JSON ) {
+				throw "This browser or environment does not provide JSON support";
+			}
+			try {
+				console.log( JSON.stringify( envelope ) );
+			}
+			catch ( exception ) {
+				try {
+					var env = _.extend( {}, envelope );
+					delete env.data;
+					console.log( JSON.stringify( env ) + "\n\t" + "JSON.stringify Error: " + exception.message );
+				}
+				catch ( ex ) {
+					console.log( "Unable to parse data to JSON: " + exception );
+				}
+			}
+		}
+	} );
+	
+	postal.diagnostics = postal.diagnostics || {};
+	
+	postal.diagnostics.console = {
+		clearFilters : function () {
+			filters = [];
+		},
+		removeFilter : function ( filter ) {
+			filters = _.filter( filters, function ( item ) {
+				return !_.isEqual( item, filter );
+			} );
+		},
+		addFilter : function ( constraint ) {
+			if ( !_.isArray( constraint ) ) {
+				constraint = [ constraint ];
+			}
+			_.each( constraint, function ( item ) {
+				if ( filters.length === 0 || !_.any( filters, function ( filter ) {
+					return _.isEqual( filter, item );
+				} ) ) {
+					filters.push( item );
+				}
+			} );
+	
+		},
+		getCurrentFilters : function () {
+			return filters;
+		},
+		removeWireTap : function () {
+			if ( wireTap ) {
+				wireTap();
+			}
+		}
+	};
+	
+	
+
+})( postal, _ );
\ No newline at end of file
diff --git a/lib/postal.diagnostics.standard.min.js b/lib/postal.diagnostics.standard.min.js
new file mode 100644
index 0000000..8e73e2f
--- /dev/null
+++ b/lib/postal.diagnostics.standard.min.js
@@ -0,0 +1 @@
+(function(a,b,c){var d=[],e=function(a,c){var d=0,f=0;return b.each(a,function(a,g){c[g]&&(f++,b.isRegExp(a)&&a.test(c[g])?d++:b.isObject(c[g])&&!b.isArray(c[g])?e(a,c[g])&&d++:b.isEqual(c[g],a)&&d++)}),d===f},f=a.addWireTap(function(a,c){if(!d.length||b.any(d,function(a){return e(a,c)})){if(!JSON)throw"This browser or environment does not provide JSON support";try{console.log(JSON.stringify(c))}catch(f){try{var g=b.extend({},c);delete g.data,console.log(JSON.stringify(g)+"\n	"+"JSON.stringify Error: "+f.message)}catch(h){console.log("Unable to parse data to JSON: "+f)}}}});a.diagnostics=a.diagnostics||{},a.diagnostics.console={clearFilters:function(){d=[]},removeFilter:function(a){d=b.filter(d,function(c){return!b.isEqual(c,a)})},addFilter:function(a){b.isArray(a)||(a=[a]),b.each(a,function(a){(d.length===0||!b.any(d,function(c){return b.isEqual(c,a)}))&&d.push(a)})},getCurrentFilters:function(){return d},removeWireTap:function(){f&&f()}}})(postal,_)
\ No newline at end of file
diff --git a/lib/postal.node.js b/lib/postal.node.js
new file mode 100644
index 0000000..22611cd
--- /dev/null
+++ b/lib/postal.node.js
@@ -0,0 +1,480 @@
+/*
+ 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.1
+ */
+
+// This is the node.js version of postal.js
+// If you need the standard or amd client lib version, go to http://github.com/ifandelse/postal.js
+var _ = require( 'underscore' );
+
+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 _obj = 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 );
+		return 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;
+	},
+
+	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( function () {
+				fn( data );
+			}, milliseconds );
+		};
+		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 ( callback ) {
+		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;
+	},
+
+	reset : function () {
+		this.cache = {};
+	}
+};
+
+var localBus = {
+
+	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 );
+			}
+		};
+	},
+
+	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, envelope );
+					} ) ) {
+						if ( typeof subDef.callback === 'function' ) {
+							subDef.callback.apply( subDef.context, [envelope.data, envelope] );
+							subDef.onHandled();
+						}
+					}
+				}
+			} );
+		} );
+	},
+
+	reset : function () {
+		if ( this.subscriptions ) {
+			_.each( this.subscriptions, function ( channel ) {
+				_.each( channel, function ( topic ) {
+					while ( topic.length ) {
+						topic.pop().unsubscribe();
+					}
+				} );
+			} );
+			this.subscriptions = {};
+		}
+	},
+
+	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;
+	},
+
+	subscriptions : {},
+
+	wireTaps : new Array( 0 ),
+
+	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;
+				}
+			}
+		}
+	}
+};
+
+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 );
+			return envelope;
+		},
+		"2" : function ( topic, data ) {
+			var envelope = { channel : DEFAULT_CHANNEL, topic : topic, timeStamp : new Date(), data : data };
+			postal.configuration.bus.publish( envelope );
+			return envelope;
+		},
+		"3" : function ( channel, topic, data ) {
+			var envelope = { channel : channel, topic : topic, timeStamp : new Date(), data : data };
+			postal.configuration.bus.publish( envelope );
+			return envelope;
+		}
+	},
+	channelPicker = {
+		"1" : function ( chn ) {
+			var channel = chn, topic, options = {};
+			if ( Object.prototype.toString.call( channel ) === "[object String]" ) {
+				channel = DEFAULT_CHANNEL;
+				topic = chn;
+			}
+			else {
+				channel = chn.channel || DEFAULT_CHANNEL;
+				topic = chn.topic;
+				options = chn.options || options;
+			}
+			return new postal.channelTypes[ options.type || "local" ]( channel, topic );
+		},
+		"2" : function ( chn, tpc ) {
+			var channel = chn, topic = tpc, options = {};
+			if ( Object.prototype.toString.call( tpc ) === "[object Object]" ) {
+				channel = DEFAULT_CHANNEL;
+				topic = chn;
+				options = tpc;
+			}
+			return new postal.channelTypes[ options.type || "local" ]( channel, topic );
+		},
+		"3" : function ( channel, topic, options ) {
+			return new postal.channelTypes[ options.type || "local" ]( channel, topic );
+		}
+	},
+	sessionInfo = {};
+
+// save some setup time, albeit tiny
+localBus.subscriptions[SYSTEM_CHANNEL] = {};
+
+var postal = {
+	configuration : {
+		bus : localBus,
+		resolver : bindingsResolver,
+		DEFAULT_CHANNEL : DEFAULT_CHANNEL,
+		DEFAULT_PRIORITY : DEFAULT_PRIORITY,
+		DEFAULT_DISPOSEAFTER : DEFAULT_DISPOSEAFTER,
+		SYSTEM_CHANNEL : SYSTEM_CHANNEL
+	},
+
+	channelTypes : {
+		local : ChannelDefinition
+	},
+
+	channel : function () {
+		var len = arguments.length;
+		if ( channelPicker[len] ) {
+			return channelPicker[len].apply( this, arguments );
+		}
+	},
+
+	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] ) {
+			return 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;
+	},
+
+	utils : {
+		getSubscribersFor : function () {
+			var channel = arguments[ 0 ],
+				tpc = arguments[ 1 ],
+				result = [];
+			if ( arguments.length === 1 ) {
+				if ( Object.prototype.toString.call( channel ) === "[object String]" ) {
+					channel = postal.configuration.DEFAULT_CHANNEL;
+					tpc = arguments[ 0 ];
+				}
+				else {
+					channel = arguments[ 0 ].channel || postal.configuration.DEFAULT_CHANNEL;
+					tpc = arguments[ 0 ].topic;
+				}
+			}
+			if ( postal.configuration.bus.subscriptions[ channel ] &&
+			     postal.configuration.bus.subscriptions[ channel ].hasOwnProperty( tpc ) ) {
+				result = postal.configuration.bus.subscriptions[ channel ][ tpc ];
+			}
+			return result;
+		},
+
+		reset : function () {
+			postal.configuration.bus.reset();
+			postal.configuration.resolver.reset();
+		}
+	}
+};
+
+module.exports = postal;
\ No newline at end of file
diff --git a/lib/postal.node.min.js b/lib/postal.node.min.js
new file mode 100644
index 0000000..6e25ed3
--- /dev/null
+++ b/lib/postal.node.min.js
@@ -0,0 +1 @@
+var _=require("underscore"),DEFAULT_CHANNEL="/",DEFAULT_PRIORITY=50,DEFAULT_DISPOSEAFTER=0,SYSTEM_CHANNEL="postal",NO_OP=function(){},DistinctPredicate=function(){var a;return function(b){var c=!1;return _.isString(b)?(c=b===a,a=b):(c=_.isEqual(b,a),a=_.clone(b)),!c}},ChannelDefinition=function(a,b){this.channel=a||DEFAULT_CHANNEL,this._topic=b||""};ChannelDefinition.prototype={subscribe:function(){var a=arguments.length;if(a===1)return new SubscriptionDefinition(this.channel,this._topic,arguments[0]);if(a===2)return new SubscriptionDefinition(this.channel,arguments[0],arguments[1])},publish:function(a){var b=a||{},c={channel:this.channel,topic:this._topic,data:b};return b.topic&&b.data&&(c=b,c.channel=c.channel||this.channel),c.timeStamp=new Date,postal.configuration.bus.publish(c),c},topic:function(a){return a===this._topic?this:new ChannelDefinition(this.channel,a)}};var SubscriptionDefinition=function(a,b,c){this.channel=a,this.topic=b,this.callback=c,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:a,topic:b}}),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 a=this.callback;return this.callback=function(b){setTimeout(a,0,b)},this},disposeAfter:function(a){if(_.isNaN(a)||a<=0)throw"The value provided to disposeAfter (maxCalls) must be a number greater than zero.";var b=this.onHandled,c=_.after(a,_.bind(function(){this.unsubscribe(this)},this));return this.onHandled=function(){b.apply(this.context,arguments),c()},this},ignoreDuplicates:function(){return this.withConstraint(new DistinctPredicate),this},withConstraint:function(a){if(!_.isFunction(a))throw"Predicate constraint must be a function";return this.constraints.push(a),this},withConstraints:function(a){var b=this;return _.isArray(a)&&_.each(a,function(a){b.withConstraint(a)}),b},withContext:function(a){return this.context=a,this},withDebounce:function(a){if(_.isNaN(a))throw"Milliseconds must be a number";var b=this.callback;return this.callback=_.debounce(b,a),this},withDelay:function(a){if(_.isNaN(a))throw"Milliseconds must be a number";var b=this.callback;return this.callback=function(c){setTimeout(function(){b(c)},a)},this},withPriority:function(a){if(_.isNaN(a))throw"Priority must be a number";return this.priority=a,this},withThrottle:function(a){if(_.isNaN(a))throw"Milliseconds must be a number";var b=this.callback;return this.callback=_.throttle(b,a),this},subscribe:function(a){return this.callback=a,this}};var bindingsResolver={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},reset:function(){this.cache={}}},localBus={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)}},publish:function(a){_.each(this.wireTaps,function(b){b(a.data,a)}),_.each(this.subscriptions[a.channel],function(b){_.each(b,function(b){postal.configuration.resolver.compare(b.topic,a.topic)&&_.all(b.constraints,function(b){return b(a.data,a)})&&typeof b.callback=="function"&&(b.callback.apply(b.context,[a.data,a]),b.onHandled())})})},reset:function(){this.subscriptions&&(_.each(this.subscriptions,function(a){_.each(a,function(a){while(a.length)a.pop().unsubscribe()})}),this.subscriptions={})},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},subscriptions:{},wireTaps:new Array(0),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}}}},publishPicker={1:function(a){if(!a)throw new Error("publishing from the 'global' postal.publish call requires a valid envelope.");return a.channel=a.channel||DEFAULT_CHANNEL,a.timeStamp=new Date,postal.configuration.bus.publish(a),a},2:function(a,b){var c={channel:DEFAULT_CHANNEL,topic:a,timeStamp:new Date,data:b};return postal.configuration.bus.publish(c),c},3:function(a,b,c){var d={channel:a,topic:b,timeStamp:new Date,data:c};return postal.configuration.bus.publish(d),d}},channelPicker={1:function(a){var b=a,c,d={};return Object.prototype.toString.call(b)==="[object String]"?(b=DEFAULT_CHANNEL,c=a):(b=a.channel||DEFAULT_CHANNEL,c=a.topic,d=a.options||d),new postal.channelTypes[d.type||"local"](b,c)},2:function(a,b){var c=a,d=b,e={};return Object.prototype.toString.call(b)==="[object Object]"&&(c=DEFAULT_CHANNEL,d=a,e=b),new postal.channelTypes[e.type||"local"](c,d)},3:function(a,b,c){return new postal.channelTypes[c.type||"local"](a,b)}},sessionInfo={};localBus.subscriptions[SYSTEM_CHANNEL]={};var postal={configuration:{bus:localBus,resolver:bindingsResolver,DEFAULT_CHANNEL:DEFAULT_CHANNEL,DEFAULT_PRIORITY:DEFAULT_PRIORITY,DEFAULT_DISPOSEAFTER:DEFAULT_DISPOSEAFTER,SYSTEM_CHANNEL:SYSTEM_CHANNEL},channelTypes:{local:ChannelDefinition},channel:function(){var a=arguments.length;if(channelPicker[a])return channelPicker[a].apply(this,arguments)},subscribe:function(a){var b=a.callback,c=a.topic,d=a.channel||DEFAULT_CHANNEL;return new SubscriptionDefinition(d,c,b)},publish:function(){var a=arguments.length;if(publishPicker[a])return publishPicker[a].apply(this,arguments)},addWireTap:function(a){return this.configuration.bus.addWireTap(a)},linkChannels:function(a,b){var c=[];return _.isArray(a)||(a=[a]),_.isArray(b)||(b=[b]),_.each(a,function(a){var d=a.topic||"*";_.each(b,function(b){var d=b.channel||DEFAULT_CHANNEL;c.push(postal.subscribe({channel:a.channel||DEFAULT_CHANNEL,topic:a.topic||"*",callback:function(a,c){var e=c;e.topic=_.isFunction(b.topic)?b.topic(c.topic):b.topic||c.topic,e.channel=d,e.data=a,postal.publish(e)}}))})}),c},utils:{getSubscribersFor:function(){var a=arguments[0],b=arguments[1],c=[];return arguments.length===1&&(Object.prototype.toString.call(a)==="[object String]"?(a=postal.configuration.DEFAULT_CHANNEL,b=arguments[0]):(a=arguments[0].channel||postal.configuration.DEFAULT_CHANNEL,b=arguments[0].topic)),postal.configuration.bus.subscriptions[a]&&postal.configuration.bus.subscriptions[a].hasOwnProperty(b)&&(c=postal.configuration.bus.subscriptions[a][b]),c},reset:function(){postal.configuration.bus.reset(),postal.configuration.resolver.reset()}}};module.exports=postal
\ No newline at end of file
diff --git a/lib/postal.standard.js b/lib/postal.standard.js
new file mode 100644
index 0000000..2f08eec
--- /dev/null
+++ b/lib/postal.standard.js
@@ -0,0 +1,482 @@
+/*
+ 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.1
+ */
+
+// This is the standard lib version of postal.js
+// If you need the amd-module style version, go to http://github.com/ifandelse/postal.js
+(function ( _, global, 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 _obj = 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 );
+		return 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;
+	},
+
+	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( function () {
+				fn( data );
+			}, milliseconds );
+		};
+		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 ( callback ) {
+		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;
+	},
+
+	reset : function () {
+		this.cache = {};
+	}
+};
+
+var localBus = {
+
+	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 );
+			}
+		};
+	},
+
+	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, envelope );
+					} ) ) {
+						if ( typeof subDef.callback === 'function' ) {
+							subDef.callback.apply( subDef.context, [envelope.data, envelope] );
+							subDef.onHandled();
+						}
+					}
+				}
+			} );
+		} );
+	},
+
+	reset : function () {
+		if ( this.subscriptions ) {
+			_.each( this.subscriptions, function ( channel ) {
+				_.each( channel, function ( topic ) {
+					while ( topic.length ) {
+						topic.pop().unsubscribe();
+					}
+				} );
+			} );
+			this.subscriptions = {};
+		}
+	},
+
+	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;
+	},
+
+	subscriptions : {},
+
+	wireTaps : new Array( 0 ),
+
+	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;
+				}
+			}
+		}
+	}
+};
+
+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 );
+			return envelope;
+		},
+		"2" : function ( topic, data ) {
+			var envelope = { channel : DEFAULT_CHANNEL, topic : topic, timeStamp : new Date(), data : data };
+			postal.configuration.bus.publish( envelope );
+			return envelope;
+		},
+		"3" : function ( channel, topic, data ) {
+			var envelope = { channel : channel, topic : topic, timeStamp : new Date(), data : data };
+			postal.configuration.bus.publish( envelope );
+			return envelope;
+		}
+	},
+	channelPicker = {
+		"1" : function ( chn ) {
+			var channel = chn, topic, options = {};
+			if ( Object.prototype.toString.call( channel ) === "[object String]" ) {
+				channel = DEFAULT_CHANNEL;
+				topic = chn;
+			}
+			else {
+				channel = chn.channel || DEFAULT_CHANNEL;
+				topic = chn.topic;
+				options = chn.options || options;
+			}
+			return new postal.channelTypes[ options.type || "local" ]( channel, topic );
+		},
+		"2" : function ( chn, tpc ) {
+			var channel = chn, topic = tpc, options = {};
+			if ( Object.prototype.toString.call( tpc ) === "[object Object]" ) {
+				channel = DEFAULT_CHANNEL;
+				topic = chn;
+				options = tpc;
+			}
+			return new postal.channelTypes[ options.type || "local" ]( channel, topic );
+		},
+		"3" : function ( channel, topic, options ) {
+			return new postal.channelTypes[ options.type || "local" ]( channel, topic );
+		}
+	},
+	sessionInfo = {};
+
+// save some setup time, albeit tiny
+localBus.subscriptions[SYSTEM_CHANNEL] = {};
+
+var postal = {
+	configuration : {
+		bus : localBus,
+		resolver : bindingsResolver,
+		DEFAULT_CHANNEL : DEFAULT_CHANNEL,
+		DEFAULT_PRIORITY : DEFAULT_PRIORITY,
+		DEFAULT_DISPOSEAFTER : DEFAULT_DISPOSEAFTER,
+		SYSTEM_CHANNEL : SYSTEM_CHANNEL
+	},
+
+	channelTypes : {
+		local : ChannelDefinition
+	},
+
+	channel : function () {
+		var len = arguments.length;
+		if ( channelPicker[len] ) {
+			return channelPicker[len].apply( this, arguments );
+		}
+	},
+
+	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] ) {
+			return 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;
+	},
+
+	utils : {
+		getSubscribersFor : function () {
+			var channel = arguments[ 0 ],
+				tpc = arguments[ 1 ],
+				result = [];
+			if ( arguments.length === 1 ) {
+				if ( Object.prototype.toString.call( channel ) === "[object String]" ) {
+					channel = postal.configuration.DEFAULT_CHANNEL;
+					tpc = arguments[ 0 ];
+				}
+				else {
+					channel = arguments[ 0 ].channel || postal.configuration.DEFAULT_CHANNEL;
+					tpc = arguments[ 0 ].topic;
+				}
+			}
+			if ( postal.configuration.bus.subscriptions[ channel ] &&
+			     postal.configuration.bus.subscriptions[ channel ].hasOwnProperty( tpc ) ) {
+				result = postal.configuration.bus.subscriptions[ channel ][ tpc ];
+			}
+			return result;
+		},
+
+		reset : function () {
+			postal.configuration.bus.reset();
+			postal.configuration.resolver.reset();
+		}
+	}
+};
+
+	global.postal = postal;
+
+})( _, window );
\ No newline at end of file
diff --git a/lib/postal.standard.min.js b/lib/postal.standard.min.js
new file mode 100644
index 0000000..a03bee4
--- /dev/null
+++ b/lib/postal.standard.min.js
@@ -0,0 +1 @@
+(function(a,b,c){var d="/",e=50,f=0,g="postal",h=function(){},i=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}},j=function(a,b){this.channel=a||d,this._topic=b||""};j.prototype={subscribe:function(){var a=arguments.length;if(a===1)return new k(this.channel,this._topic,arguments[0]);if(a===2)return new k(this.channel,arguments[0],arguments[1])},publish:function(a){var b=a||{},c={channel:this.channel,topic:this._topic,data:b};return b.topic&&b.data&&(c=b,c.channel=c.channel||this.channel),c.timeStamp=new Date,q.configuration.bus.publish(c),c},topic:function(a){return a===this._topic?this:new j(this.channel,a)}};var k=function(a,b,c){this.channel=a,this.topic=b,this.callback=c,this.priority=e,this.constraints=new Array(0),this.maxCalls=f,this.onHandled=h,this.context=null,q.configuration.bus.publish({channel:g,topic:"subscription.created",timeStamp:new Date,data:{event:"subscription.created",channel:a,topic:b}}),q.configuration.bus.subscribe(this)};k.prototype={unsubscribe:function(){q.configuration.bus.unsubscribe(this),q.configuration.bus.publish({channel:g,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 i),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(function(){c(a)},b)},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=a,this}};var l={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},reset:function(){this.cache={}}},m={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)}},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){q.configuration.resolver.compare(c.topic,b.topic)&&a.all(c.constraints,function(a){return a(b.data,b)})&&typeof c.callback=="function"&&(c.callback.apply(c.context,[b.data,b]),c.onHandled())})})},reset:function(){this.subscriptions&&(a.each(this.subscriptions,function(b){a.each(b,function(a){while(a.length)a.pop().unsubscribe()})}),this.subscriptions={})},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},subscriptions:{},wireTaps:new Array(0),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}}}},n={1:function(a){if(!a)throw new Error("publishing from the 'global' postal.publish call requires a valid envelope.");return a.channel=a.channel||d,a.timeStamp=new Date,q.configuration.bus.publish(a),a},2:function(a,b){var c={channel:d,topic:a,timeStamp:new Date,data:b};return q.configuration.bus.publish(c),c},3:function(a,b,c){var d={channel:a,topic:b,timeStamp:new Date,data:c};return q.configuration.bus.publish(d),d}},o={1:function(a){var b=a,c,e={};return Object.prototype.toString.call(b)==="[object String]"?(b=d,c=a):(b=a.channel||d,c=a.topic,e=a.options||e),new q.channelTypes[e.type||"local"](b,c)},2:function(a,b){var c=a,e=b,f={};return Object.prototype.toString.call(b)==="[object Object]"&&(c=d,e=a,f=b),new q.channelTypes[f.type||"local"](c,e)},3:function(a,b,c){return new q.channelTypes[c.type||"local"](a,b)}},p={};m.subscriptions[g]={};var q={configuration:{bus:m,resolver:l,DEFAULT_CHANNEL:d,DEFAULT_PRIORITY:e,DEFAULT_DISPOSEAFTER:f,SYSTEM_CHANNEL:g},channelTypes:{local:j},channel:function(){var a=arguments.length;if(o[a])return o[a].apply(this,arguments)},subscribe:function(a){var b=a.callback,c=a.topic,e=a.channel||d;return new k(e,c,b)},publish:function(){var a=arguments.length;if(n[a])return n[a].apply(this,arguments)},addWireTap:function(a){return this.configuration.bus.addWireTap(a)},linkChannels:function(b,c){var e=[];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||d;e.push(q.subscribe({channel:b.channel||d,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,q.publish(e)}}))})}),e},utils:{getSubscribersFor:function(){var a=arguments[0],b=arguments[1],c=[];return arguments.length===1&&(Object.prototype.toString.call(a)==="[object String]"?(a=q.configuration.DEFAULT_CHANNEL,b=arguments[0]):(a=arguments[0].channel||q.configuration.DEFAULT_CHANNEL,b=arguments[0].topic)),q.configuration.bus.subscriptions[a]&&q.configuration.bus.subscriptions[a].hasOwnProperty(b)&&(c=q.configuration.bus.subscriptions[a][b]),c},reset:function(){q.configuration.bus.reset(),q.configuration.resolver.reset()}}};b.postal=q})(_,window)
\ No newline at end of file
diff --git a/src/main/ChannelDefinition.js b/src/main/ChannelDefinition.js
index c509685..9391e89 100644
--- a/src/main/ChannelDefinition.js
+++ b/src/main/ChannelDefinition.js
@@ -15,14 +15,15 @@ ChannelDefinition.prototype = {
 	},
 
 	publish : function ( obj ) {
+    var _obj = obj || {};
 		var envelope = {
 			channel : this.channel,
 			topic : this._topic,
-			data : obj || {}
+			data : _obj
 		};
 		// If this is an envelope....
-		if ( obj.topic && obj.data ) {
-			envelope = obj;
+		if ( _obj.topic && _obj.data ) {
+			envelope = _obj;
 			envelope.channel = envelope.channel || this.channel;
 		}
 		envelope.timeStamp = new Date();
diff --git a/src/main/VersionHeader.js b/src/main/VersionHeader.js
index a3cefd2..30beb0f 100644
--- a/src/main/VersionHeader.js
+++ b/src/main/VersionHeader.js
@@ -2,5 +2,5 @@
  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
+ Version 0.6.1
  */