diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79f7638..411787f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 #### 0.4.1 (Next)
 
+* [#43](https://github.com/slack-ruby/slack-ruby-bot-server/pull/43): Fix: `cannot load kaminari/grape` - [@dblock](https://github.com/dblock).
+* [#43](https://github.com/slack-ruby/slack-ruby-bot-server/pull/43): Fix: `undefined method `[]' for nil:NilClass` in APIs - [@dblock](https://github.com/dblock).
 * [#28](https://github.com/slack-ruby/slack-ruby-bot-server/pull/28): Use slack-ruby-danger gem - [@dblock](https://github.com/dblock).
 * [#31](https://github.com/slack-ruby/slack-ruby-bot-server/pull/31): Adds MONGODB_URI as environment variable for MongoDB - [@corprew](https://github.com/corprew).
 * Your contribution here.
diff --git a/Gemfile b/Gemfile
index 30956ae..2dc51c9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'rack-server-pages', github: 'dblock/rack-server-pages', branch: 'next'
+  gem 'rack-server-pages'
   gem 'bundler'
   gem 'rake'
   gem 'rspec'
diff --git a/slack-ruby-bot-server.gemspec b/slack-ruby-bot-server.gemspec
index 27388a2..41259a0 100644
--- a/slack-ruby-bot-server.gemspec
+++ b/slack-ruby-bot-server.gemspec
@@ -21,9 +21,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'unicorn'
   spec.add_dependency 'grape'
   spec.add_dependency 'grape-swagger'
+  spec.add_dependency 'roar', '~> 1.0.4'
   spec.add_dependency 'grape-roar'
   spec.add_dependency 'rack-cors'
   spec.add_dependency 'kaminari-mongoid'
+  spec.add_dependency 'kaminari-grape'
   spec.add_dependency 'mongoid-scroll'
   spec.add_dependency 'rack-rewrite'
   spec.add_dependency 'rack-server-pages'