diff --git a/bin/ibproxy b/bin/ibproxy
index f7dbbcf..96f94cc 100755
--- a/bin/ibproxy
+++ b/bin/ibproxy
@@ -18,15 +18,28 @@ default_command :server
 command :server do |c|
   c.syntax = 'ibproxy server [options]'
   c.summary = 'Start ibproxy server'
-  c.option '--ib-port PORT', Integer, "Interactive brokers client port. #{IbRubyProxy::Server::IbProxyService::DEFAULT_IB_GATEWAY_PORT} by default (Gateway). Default for TWS is whatever"
+
+  c.option '--ib-host HOST', String, "Host for interactive brokers client. #{IbRubyProxy::Server::IbProxyService::DEFAULT_IB_HOST} by default"
+  c.option '--ib-port PORT', Integer, "Port for interactive brokers client. #{IbRubyProxy::Server::IbProxyService::DEFAULT_IB_GATEWAY_PORT} by default (Gateway). Default for TWS is whatever"
+  c.option '--drb-host HOST', String, "Host for the server drb endpoint. #{IbRubyProxy::Server::IbProxyService::DEFAULT_DRB_HOST} by default"
   c.option '--drb-port PORT', Integer, "Port for the served drb endpoint. #{IbRubyProxy::Server::IbProxyService::DEFAULT_DRB_PORT} by default"
+
   c.action do |args, options|
-    options.default ib_port: IbRubyProxy::Server::IbProxyService::DEFAULT_IB_GATEWAY_PORT,
-                    drb_port: IbRubyProxy::Server::IbProxyService::DEFAULT_DRB_PORT
+    options.default(
+      ib_host: IbRubyProxy::Server::IbProxyService::DEFAULT_IB_HOST,
+      ib_port: IbRubyProxy::Server::IbProxyService::DEFAULT_IB_GATEWAY_PORT,
+      drb_host: IbRubyProxy::Server::IbProxyService::DEFAULT_DRB_HOST,
+      drb_port: IbRubyProxy::Server::IbProxyService::DEFAULT_DRB_PORT,
+    )
+
+    ib_host = options.ib_host
     ib_port = options.ib_port
+    drb_host = options.drb_host
     drb_port = options.drb_port
+
     puts "Starting with ib port #{ib_port} and drb port #{drb_port}..."
-    IbRubyProxy::Server::IbProxyService.new(ib_port: ib_port, drb_port: drb_port).start
+    IbRubyProxy::Server::IbProxyService.new(
+      ib_host: ib_host, ib_port: ib_port, drb_host: drb_host, drb_port: drb_port
+    ).start
   end
 end
-
diff --git a/lib/ib_ruby_proxy/server/ib_proxy_service.rb b/lib/ib_ruby_proxy/server/ib_proxy_service.rb
index 2929c73..f03dbee 100644
--- a/lib/ib_ruby_proxy/server/ib_proxy_service.rb
+++ b/lib/ib_ruby_proxy/server/ib_proxy_service.rb
@@ -20,15 +20,17 @@ module Server
     # * Starts an IB message-processing thread that will dispatch messages sent to IB client app (
     #   gateway or TWS)
     class IbProxyService
+      DEFAULT_IB_HOST = 'localhost'
       DEFAULT_IB_GATEWAY_PORT = 4002
+      DEFAULT_DRB_HOST = 'localhost'
       DEFAULT_DRB_PORT = 1992
 
       # @param [String] ib_host Hostname for the IB client app (gateway or TWS). Default +localhost+
       # @param [Integer] ib_port Port for hte IB client app (gateway or TWS). Default +4002+ (gateway)
       # @param [String] drb_host Hostname for the DRB process. Default +localhost+
       # @param [Integer] drb_port Port for the . Default +1992+
-      def initialize(ib_host: 'localhost', ib_port: DEFAULT_IB_GATEWAY_PORT,
-                     drb_host: 'localhost', drb_port: DEFAULT_DRB_PORT)
+      def initialize(ib_host: DEFAULT_IB_HOST, ib_port: DEFAULT_IB_GATEWAY_PORT,
+                     drb_host: DEFAULT_DRB_HOST, drb_port: DEFAULT_DRB_PORT)
         @ib_host = ib_host
         @ib_port = ib_port
         @drb_host = drb_host