diff --git a/Gemfile b/Gemfile
index ffdf7e0..4d06674 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ group :test do
   gem 'sprockets-rails', '2.3.3'
   gem 'rails', "#{ENV['RAILS'] || default_rails_version}"
   gem 'rspec-rails'
-  gem 'activeadmin', github: 'activeadmin', ref: '06aa8b2af692e46fc360832473ca63e23a70b3d4'
+  gem 'activeadmin', '1.1.0'
   gem 'coveralls', require: false # Test coverage website. Go to https://coveralls.io
   gem 'sass-rails'
   gem 'sqlite3'
diff --git a/active_admin_datetimepicker.gemspec b/active_admin_datetimepicker.gemspec
index c8c8d3a..3e62b30 100644
--- a/active_admin_datetimepicker.gemspec
+++ b/active_admin_datetimepicker.gemspec
@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "xdan-datetimepicker-rails", "~> 2.5.1"
+  spec.add_dependency "activeadmin", "~> 1.1.0"
   spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rake", "~> 10.0"
 
diff --git a/app/assets/javascripts/active_admin_datetimepicker.js.coffee b/app/assets/javascripts/active_admin_datetimepicker.js.coffee
index 9d65a15..2d74aab 100644
--- a/app/assets/javascripts/active_admin_datetimepicker.js.coffee
+++ b/app/assets/javascripts/active_admin_datetimepicker.js.coffee
@@ -14,7 +14,13 @@
     options = $(entry).data 'datepicker-options'
     $(entry).datetimepicker $.extend(defaults, options)
 
-$(document).on 'ready turbolinks:load', ->
+@initXdanDateTimePickerPlugin = () ->
   setupDateTimePicker $('body')
   $(document).on 'has_many_add:after', '.has_many_container', (e, fieldset) ->
     setupDateTimePicker fieldset
+
+$(document).ready ->
+  initXdanDateTimePickerPlugin()
+
+$(document).on 'turbolinks:load', ->
+  initXdanDateTimePickerPlugin()
diff --git a/app/assets/stylesheets/active_admin_datetimepicker.scss b/app/assets/stylesheets/active_admin_datetimepicker.scss
index b1fafc1..d91fb9b 100644
--- a/app/assets/stylesheets/active_admin_datetimepicker.scss
+++ b/app/assets/stylesheets/active_admin_datetimepicker.scss
@@ -1,4 +1,4 @@
-@import "jquery.xdan.datetimepicker";
+@import "jquery.xdan.datetimepicker.css";
 
 form.filter_form {
   .filter_form_field {
diff --git a/lib/active_admin_datetimepicker/base.rb b/lib/active_admin_datetimepicker/base.rb
index 268f31e..d31d811 100644
--- a/lib/active_admin_datetimepicker/base.rb
+++ b/lib/active_admin_datetimepicker/base.rb
@@ -13,7 +13,7 @@ def input_html_data
       {}
     end
 
-    def input_html_options(input_name = nil)
+    def input_html_options(input_name = nil, placeholder = nil)
       options = {}
       options[:class] = [self.options[:class], html_class].compact.join(' ')
       options[:data] ||= input_html_data
diff --git a/lib/active_admin_datetimepicker/inputs/filters/date_time_range_input.rb b/lib/active_admin_datetimepicker/inputs/filters/date_time_range_input.rb
index c00154f..e5fc7b8 100644
--- a/lib/active_admin_datetimepicker/inputs/filters/date_time_range_input.rb
+++ b/lib/active_admin_datetimepicker/inputs/filters/date_time_range_input.rb
@@ -5,7 +5,7 @@ class DateTimeRangeInput < DateRangeInput
         include Base
         include ActiveAdminDatetimepicker::Base
 
-        def input_html_options(input_name = gt_input_name)
+        def input_html_options(input_name = gt_input_name, placeholder = gt_input_placeholder)
           super.tap do |options|
             options[:class] = html_class
           end
diff --git a/lib/active_admin_datetimepicker/version.rb b/lib/active_admin_datetimepicker/version.rb
index 69be914..dabd96a 100644
--- a/lib/active_admin_datetimepicker/version.rb
+++ b/lib/active_admin_datetimepicker/version.rb
@@ -1,3 +1,3 @@
 module ActiveAdminDatetimepicker
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end