diff --git a/lib/epp/server.rb b/lib/epp/server.rb
index 856e603..8c0497a 100644
--- a/lib/epp/server.rb
+++ b/lib/epp/server.rb
@@ -3,7 +3,7 @@ class Server
     include LibXML::XML
     include RequiresParameters
         
-    attr_accessor :tag, :password, :server, :port, :lang, :services, :extensions, :version
+    attr_accessor :tag, :password, :server, :port, :lang, :services, :extensions, :version, :context
     
     # ==== Required Attrbiutes
     # 
@@ -29,6 +29,7 @@ def initialize(attributes = {})
       @services   = attributes[:services]   || ["urn:ietf:params:xml:ns:domain-1.0", "urn:ietf:params:xml:ns:contact-1.0", "urn:ietf:params:xml:ns:host-1.0"]
       @extensions = attributes[:extensions] || []
       @version    = attributes[:version]    || "1.0"
+      @context    = attributes[:context]    || nil
       
       @logged_in  = false
     end
@@ -77,7 +78,7 @@ def send_request(xml)
 		# server upon connection.
     def open_connection
       @connection = TCPSocket.new(server, port)
-      @socket = OpenSSL::SSL::SSLSocket.new(@connection) if @connection
+      @socket = OpenSSL::SSL::SSLSocket.new(*[@connection, @context].compact) if @connection
       
       @socket.sync_close = true
       @socket.connect