diff --git a/.ruby-version b/.ruby-version
index 7c32728..8f9174b 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.1.1
\ No newline at end of file
+2.1.2
\ No newline at end of file
diff --git a/app/controllers/swagger_yard/swagger_controller.rb b/app/controllers/swagger_yard/swagger_controller.rb
index fdec9cc..d2ff04e 100644
--- a/app/controllers/swagger_yard/swagger_controller.rb
+++ b/app/controllers/swagger_yard/swagger_controller.rb
@@ -10,7 +10,7 @@ def index
 
     def show
       swagger_api = SwaggerYard.get_api("/#{params[:resource]}")
-      swagger_api.merge!("basePath" => request.base_url + SwaggerYard.api_path) if swagger_api["basePath"].blank? 
+      swagger_api.merge!("basePath" => request.base_url + request.script_name + "/api") if swagger_api["basePath"].blank? 
       render :json => swagger_api
     end
 
diff --git a/app/views/swagger_yard/swagger/doc.html.erb b/app/views/swagger_yard/swagger/doc.html.erb
index 4845cad..86808c8 100644
--- a/app/views/swagger_yard/swagger/doc.html.erb
+++ b/app/views/swagger_yard/swagger/doc.html.erb
@@ -20,7 +20,7 @@
     <script type="text/javascript">
 	$(function () {
 	    window.swaggerUi = new SwaggerUi({
-                discoveryUrl: location.protocol + "//" + location.host + "/swagger/api",
+                discoveryUrl: "<%= request.base_url + request.script_name + '/api' %>",
                 dom_id:"swagger-ui-container",
                 supportHeaderParams: true,
                 supportedSubmitMethods: ['get', 'post', 'put'],
diff --git a/lib/swagger_yard.rb b/lib/swagger_yard.rb
index 0db3ada..7b8c2ff 100644
--- a/lib/swagger_yard.rb
+++ b/lib/swagger_yard.rb
@@ -79,6 +79,10 @@ def get_listing
       end
     end
 
+    def clear_cache
+      cache["listing_index"] = nil
+    end
+
   private
     ##
     # Register some custom yard tags used by swagger-ui
diff --git a/lib/swagger_yard/engine.rb b/lib/swagger_yard/engine.rb
index ca052ba..59ea1e0 100644
--- a/lib/swagger_yard/engine.rb
+++ b/lib/swagger_yard/engine.rb
@@ -2,17 +2,21 @@
 
 module SwaggerYard
   class Engine < ::Rails::Engine
-    if SwaggerYard::LocalDispatcher.new.server?
-      isolate_namespace SwaggerYard
+    isolate_namespace SwaggerYard
 
-      # NOTE: We should opt for asset pipeline instead of this.
-      initializer 'swagger_yard.load_static_assets' do |app|
-        app.middleware.use(::ActionDispatch::Static, "#{root}/public")
-      end
+    initializer :after do |app|     
+      if SwaggerYard::LocalDispatcher.new.server?
+        # NOTE: We should opt for asset pipeline instead of this.
+        #initializer 'swagger_yard.load_static_assets' do |app|
+          app.middleware.use(::ActionDispatch::Static, "#{root}/public")
+        #end
 
-      initializer "swagger_yard.finisher_hook" do |app|
-        SwaggerYard.generate!("#{app.root}/app/controllers/**/*.rb")
+        #initializer "swagger_yard.finisher_hook" do |app|
+          SwaggerYard.generate!("#{app.root}/app/controllers/**/*.rb")
+        #end
+          SwaggerYard.clear_cache
       end
     end
+
   end
 end
diff --git a/lib/swagger_yard/local_dispatcher.rb b/lib/swagger_yard/local_dispatcher.rb
index 9b29cf0..e3f123f 100644
--- a/lib/swagger_yard/local_dispatcher.rb
+++ b/lib/swagger_yard/local_dispatcher.rb
@@ -10,13 +10,13 @@ def discovered_dispatcher
     end
 
     def server?
-      [:thin, :unicorn].include?(discovered_dispatcher)
+      [:webrick, :thin, :unicorn].include?(discovered_dispatcher)
     end
 
   private
 
     def discover_dispatcher
-      dispatchers = %w[sidekiq thin unicorn]
+      dispatchers = %w[sidekiq thin unicorn webrick]
       while dispatchers.any? && @discovered_dispatcher.nil?
         send 'check_for_' + (dispatchers.shift)
       end
@@ -47,5 +47,11 @@ def check_for_thin
         @discovered_dispatcher = :thin
       end
     end
+
+    def check_for_webrick
+      if !defined?(::WEBrick).nil? 
+        @discovered_dispatcher = :webrick
+      end
+    end
   end
 end
\ No newline at end of file