diff --git a/src/address.js b/src/address.js
index 97df02a..9f701c8 100644
--- a/src/address.js
+++ b/src/address.js
@@ -14,7 +14,11 @@ var p2sh_types = {
 };
 
 var Address = function (bytes, version) {
-    if (typeof bytes === 'string') {
+    if (arguments[0] instanceof Address) {
+        this.hash = arguments[0].hash;
+        this.version = arguments[0].version;
+    }
+    else if (typeof bytes === 'string') {
         this.hash = 
               bytes.length <= 34     ? base58.checkDecode(bytes)
             : bytes.length <= 40     ? conv.hexToBytes(bytes)
diff --git a/src/script.js b/src/script.js
index 865e9ac..224ec79 100644
--- a/src/script.js
+++ b/src/script.js
@@ -296,6 +296,7 @@ Script.prototype.writeBytes = function (data)
 Script.createOutputScript = function (address)
 {
   var script = new Script();
+  address = new Address(address);
   // Standard pay-to-pubkey-hash
   if (!address.version) {
       script.writeOp(Opcode.map.OP_DUP);