diff --git a/.gitignore b/.gitignore
index eb03e3e1..ca038566 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 node_modules
 *.log
+ssl/*.pem
diff --git a/Gulpfile.js b/Gulpfile.js
index 385ee9ca..ddccbcb0 100644
--- a/Gulpfile.js
+++ b/Gulpfile.js
@@ -2,11 +2,21 @@
 const babel = require('rollup-plugin-babel');
 const eslint = require('gulp-eslint');
 const gulp = require('gulp');
+const header = require('gulp-header');
 const minify = require('uglify-js').minify;
 const rollup = require('rollup-stream');
 const source = require('vinyl-source-stream');
 const uglify = require('rollup-plugin-uglify');
 
+const pkg = require('./package.json');
+const banner = ['/**',
+  ' * <%= pkg.name %> - <%= pkg.description %>',
+  ' * @version v<%= pkg.version %>',
+  ' * @link <%= pkg.homepage %>',
+  ' * @license <%= pkg.license %>',
+  ' */',
+  ''].join('\n');
+
 gulp.task('build', () =>
   rollup({
     entry: './lib/postmate.js',
@@ -20,6 +30,7 @@ gulp.task('build', () =>
     ],
   })
     .pipe(source('postmate.min.js'))
+    .pipe(header(banner, { pkg }))
     .pipe(gulp.dest('./build'))
 );
 
diff --git a/build/postmate.min.js b/build/postmate.min.js
index 663e08b2..0cdbaad2 100644
--- a/build/postmate.min.js
+++ b/build/postmate.min.js
@@ -1 +1,7 @@
-!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):e.Postmate=n()}(this,function(){"use strict";function e(){var e;(e=console).log.apply(e,arguments)}function n(e){var n=document.createElement("a");return n.href=e,n.origin}function t(e,n){return e.origin===n&&("object"===r(e.data)&&("postmate"in e.data&&e.data.type===d))}function a(e,n,t){var a="function"==typeof e[n]?e[n](t):e[n];return Promise.resolve(a)}function i(n){var i=n.id,r=n.context,o=n.parent,s=n.parentOrigin,u=n.frame,c=n.child,h=n.childOrigin;return e('Registering consumer: "'+i+'"'),"parent"===i?(e("Parent awaiting messages..."),{frame:u,get:function(e,n){return new Promise(function(t){var a=(new Date).getTime(),i=function e(n){n.data.uid===a&&(o.removeEventListener("message",e,!1),t(n.data.value))};o.addEventListener("message",i,!1),c.postMessage({data:n,postmate:"request",type:d,key:e,uid:a},h)})}}):void("child"===i&&(e("Child awaiting messages..."),c.addEventListener("message",function(n){if(t(n,s)){e("Child received message",n.data);var i=n.data,o=i.data,u=i.key,c=i.uid;a(r,u,o).then(function(e){return n.source.postMessage({key:u,postmate:"reply",type:d,uid:c,value:e},n.origin)})}})))}var r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol?"symbol":typeof e},o=function(e,n){if(!(e instanceof n))throw new TypeError("Cannot call a class as a function")},s=function(){function e(e,n){for(var t=0;t<n.length;t++){var a=n[t];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}}return function(n,t,a){return t&&e(n.prototype,t),a&&e(n,a),n}}(),d="application/x-postmate-v1+json",u=function(){function n(e){return o(this,n),this.id="child",this.child=window,this.context=e,this.parent=this.child.parent,this.sendHandshakeReply()}return s(n,[{key:"sendHandshakeReply",value:function(){var n=this;return new Promise(function(t,a){var r=function r(o){return"handshake"===o.data.postmate?(e("Child: Received handshake from Parent"),n.child.removeEventListener("message",r,!1),e("Child: Sending handshake reply to Parent"),o.source.postMessage({postmate:"handshake-reply",type:d},o.origin),n.parentOrigin=o.origin,e("Child: Saving Parent origin",n.parentOrigin),t(new i(n))):a("Handshake Reply Failed")};n.child.addEventListener("message",r,!1)})}}]),n}();return u.Handshake=function(){function a(e){o(this,a);var n=e.container,t=e.url;return this.id="parent",this.parent=window,this.frame=document.createElement("iframe"),n.appendChild(this.frame),this.child=this.frame.contentWindow,this.sendHandshake(t)}return s(a,[{key:"sendHandshake",value:function(a){var r=this,o=n(a);return new Promise(function(n,s){var u=function a(d){return t(d,o)?"handshake-reply"===d.data.postmate?(e("Parent: Received handshake reply from Child"),r.parent.removeEventListener("message",a,!1),r.childOrigin=d.origin,e("Parent: Saving Child origin",r.childOrigin),n(new i(r))):(e("Parent: Invalid handshake reply"),s("Failed handshake")):s("Invalid message signature")};r.parent.addEventListener("message",u,!1),r.frame.onload=function(){e("Parent: Sending handshake"),r.child.postMessage({postmate:"handshake",type:d},o)},e("Parent: Loading frame"),r.frame.src=a})}}]),a}(),u});
\ No newline at end of file
+/**
+ * postmate - A powerful, simple, promise-based postMessage library
+ * @version v0.3.0
+ * @link https://github.com/dollarshaveclub/postmate
+ * @license MIT
+ */
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):e.Postmate=n()}(this,function(){"use strict";function e(){var e;(e=console).log.apply(e,arguments)}function n(e){var n=document.createElement("a");return n.href=e,n.origin}function t(e,n){return e.origin===n&&("object"===r(e.data)&&("postmate"in e.data&&e.data.type===d))}function a(e,n,t){var a="function"==typeof e[n]?e[n](t):e[n];return Promise.resolve(a)}function i(n){var i=n.id,r=n.context,o=n.parent,s=n.parentOrigin,u=n.frame,c=n.child,h=n.childOrigin;return e('Registering consumer: "'+i+'"'),"parent"===i?(e("Parent awaiting messages..."),{frame:u,get:function(e,n){return new Promise(function(t){var a=(new Date).getTime(),i=function e(n){n.data.uid===a&&(o.removeEventListener("message",e,!1),t(n.data.value))};o.addEventListener("message",i,!1),c.postMessage({data:n,postmate:"request",type:d,key:e,uid:a},h)})}}):void("child"===i&&(e("Child awaiting messages..."),c.addEventListener("message",function(n){if(t(n,s)){e("Child received message",n.data);var i=n.data,o=i.data,u=i.key,c=i.uid;a(r,u,o).then(function(e){return n.source.postMessage({key:u,postmate:"reply",type:d,uid:c,value:e},n.origin)})}})))}var r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol?"symbol":typeof e},o=function(e,n){if(!(e instanceof n))throw new TypeError("Cannot call a class as a function")},s=function(){function e(e,n){for(var t=0;t<n.length;t++){var a=n[t];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}}return function(n,t,a){return t&&e(n.prototype,t),a&&e(n,a),n}}(),d="application/x-postmate-v1+json",u=function(){function n(e){return o(this,n),this.id="child",this.child=window,this.context=e,this.parent=this.child.parent,this.sendHandshakeReply()}return s(n,[{key:"sendHandshakeReply",value:function(){var n=this;return new Promise(function(t,a){var r=function r(o){return"handshake"===o.data.postmate?(e("Child: Received handshake from Parent"),n.child.removeEventListener("message",r,!1),e("Child: Sending handshake reply to Parent"),o.source.postMessage({postmate:"handshake-reply",type:d},o.origin),n.parentOrigin=o.origin,e("Child: Saving Parent origin",n.parentOrigin),t(new i(n))):a("Handshake Reply Failed")};n.child.addEventListener("message",r,!1)})}}]),n}();return u.Handshake=function(){function a(e){o(this,a);var n=e.container,t=e.url;return this.id="parent",this.parent=window,this.frame=document.createElement("iframe"),n.appendChild(this.frame),this.child=this.frame.contentWindow,this.sendHandshake(t)}return s(a,[{key:"sendHandshake",value:function(a){var r=this,o=n(a);return new Promise(function(n,s){var u=function a(d){return!!t(d,o)&&("handshake-reply"===d.data.postmate?(e("Parent: Received handshake reply from Child"),r.parent.removeEventListener("message",a,!1),r.childOrigin=d.origin,e("Parent: Saving Child origin",r.childOrigin),n(new i(r))):(e("Parent: Invalid handshake reply"),s("Failed handshake")))};r.parent.addEventListener("message",u,!1),r.frame.onload=function(){e("Parent: Sending handshake"),r.child.postMessage({postmate:"handshake",type:d},o)},e("Parent: Loading frame"),r.frame.src=a})}}]),a}(),u});
\ No newline at end of file
diff --git a/lib/postmate.js b/lib/postmate.js
index 1b94d854..0de18038 100644
--- a/lib/postmate.js
+++ b/lib/postmate.js
@@ -192,6 +192,9 @@ Postmate.Handshake = class Handshake {
           log('Parent: Saving Child origin', this.childOrigin);
           return resolve(new ComsumerAPI(this));
         }
+
+        // Might need to remove since parent might be receiving different messages
+        // from different hosts
         log('Parent: Invalid handshake reply');
         return reject('Failed handshake');
       };
diff --git a/package.json b/package.json
index 6cf85f56..36f89875 100644
--- a/package.json
+++ b/package.json
@@ -1,14 +1,16 @@
 {
   "name": "postmate",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "description": "A powerful, simple, promise-based postMessage library",
   "main": "lib/postmate.js",
   "devDependencies": {
     "babel-preset-es2015-rollup": "^1.1.1",
     "eslint-config-airbnb": "^9.0.1",
     "eslint-plugin-import": "^1.12.0",
+    "express": "^4.14.0",
     "gulp": "^3.9.1",
     "gulp-eslint": "^3.0.1",
+    "gulp-header": "^1.8.7",
     "rollup-plugin-babel": "^2.6.1",
     "rollup-plugin-uglify": "^1.0.1",
     "rollup-stream": "^1.11.0",
@@ -17,11 +19,14 @@
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "serve-parent": "python -m SimpleHTTPServer 4000",
-    "serve-child": "python -m SimpleHTTPServer 4001",
+    "serve-parent": "PORT=4000 node sandbox.js",
+    "serve-child": "PORT=4001 node sandbox.js",
     "build": "gulp build",
     "build-watch": "gulp build-watch",
-    "lint": "gulp lint"
+    "lint": "gulp lint",
+    "postpublish": "PACKAGE_VERSION=$(cat package.json | grep version | head -1 | awk -F: '{ print $2 }' | sed 's/[\",]//g' | tr -d '[[:space:]]') && git tag $PACKAGE_VERSION && git push origin --tags",
+    "ssl-gen-cert": "openssl req -x509 -newkey rsa:2048 -keyout ./ssl/key.pem -out ./ssl/cert.pem -days 365",
+    "ssl-move-pass": "openssl rsa -in ./ssl/key.pem -out ./ssl/new-key.pem && mv ./ssl/new-key.pem ./ssl/key.pem"
   },
   "repository": {
     "type": "git",
@@ -38,5 +43,5 @@
   "bugs": {
     "url": "https://github.com/dollarshaveclub/postmate/issues"
   },
-  "homepage": "https://github.com/dollarshaveclub/postmate#readme"
+  "homepage": "https://github.com/dollarshaveclub/postmate"
 }
diff --git a/sandbox.js b/sandbox.js
new file mode 100644
index 00000000..c9ec62dd
--- /dev/null
+++ b/sandbox.js
@@ -0,0 +1,24 @@
+const path = require('path');
+const fs = require('fs');
+const https = require('https');
+const express = require('express');
+
+// Options
+const app = express();
+const port = process.env.PORT || 4000;
+const useSSL = fs.existsSync(path.join(__dirname, 'ssl', 'cert.pem'));
+const staticPath = (folder) => express.static(path.join(__dirname, folder));
+
+// Routes
+app.use('/sandbox', staticPath('sandbox'));
+app.use('/build', staticPath('build'));
+
+// http://blog.mgechev.com/2014/02/19/create-https-tls-ssl-application-with-express-nodejs/
+if (useSSL) {
+  https.createServer({
+    key: fs.readFileSync(path.join(__dirname, 'ssl', 'key.pem')),
+    cert: fs.readFileSync(path.join(__dirname, 'ssl', 'cert.pem')),
+  }, app).listen(port, () => console.log(`Sandbox served at https://localhost:${port}`));
+} else {
+  app.listen(port, () => console.log(`Sandbox served at http://localhost:${port}`));
+}
diff --git a/ssl/.gitkeep b/ssl/.gitkeep
new file mode 100644
index 00000000..e69de29b